From 68f662329d63ee618c9c9c56000bbf656e2b6b76 Mon Sep 17 00:00:00 2001 From: Matthieu Baechler Date: Thu, 18 Jan 2024 10:20:01 +0100 Subject: [PATCH 1/6] Provide types for overridden methods manual migration --- .../normation/cfclerk/domain/Constraint.scala | 5 +- .../com/normation/eventlog/EventLog.scala | 6 +- .../normation/rudder/api/DataStructures.scala | 6 +- .../rudder/batch/AsyncWorkflowInfo.scala | 2 +- .../domain/eventlog/ArchiveEventLog.scala | 28 ++-- .../domain/eventlog/AssetsEventLog.scala | 8 +- .../eventlog/ChangeRequestEventLog.scala | 16 +- .../domain/eventlog/DirectiveEventLog.scala | 14 +- .../domain/eventlog/GenericEventLog.scala | 37 ++--- .../eventlog/ModifyGlobalProperty.scala | 6 +- .../rudder/domain/eventlog/NodeEventLog.scala | 12 +- .../domain/eventlog/NodeGroupEventLog.scala | 14 +- .../domain/eventlog/ParameterEventLog.scala | 14 +- .../eventlog/PolicyServerEventLog.scala | 9 +- .../domain/eventlog/PromisesEventLog.scala | 10 +- .../rudder/domain/eventlog/RuleEventLog.scala | 8 +- .../domain/eventlog/SecretEventLog.scala | 15 +- .../domain/eventlog/TechniqueEventLog.scala | 18 +-- .../rudder/domain/eventlog/UserEventLog.scala | 19 +-- .../domain/eventlog/WorkflowEventLog.scala | 6 +- .../domain/logger/DebugComplianceLogger.scala | 2 +- .../queries/NodeQueryCriteriaData.scala | 30 ++-- .../rudder/git/GitRevisionProvider.scala | 2 +- .../rudder/repository/xml/GitArchivers.scala | 4 +- .../quicksearch/QuickSearchDomain.scala | 16 +- .../services/reports/ExecutionBatch.scala | 4 +- .../CommitAndDeployChangeRequestService.scala | 12 +- .../services/DummyTechniqueRepository.scala | 4 +- .../services/JGitPackageReaderTest.scala | 8 +- .../cfclerk/services/JGitRepositoryTest.scala | 5 +- .../com/normation/rudder/MockServices.scala | 4 +- .../facts/nodes/TestSaveInventory.scala | 2 +- .../rudder/migration/TestDbMigration.scala | 2 +- .../jdbc/ReportingServiceTest.scala | 4 +- .../ldap/GlobalParamMigration61Test.scala | 5 +- .../ldap/InventoryNodeInfoCompatTest.scala | 5 +- .../services/reports/ExecutionBatchTest.scala | 10 +- .../rudder/rest/ApiDatastructures.scala | 6 +- .../rudder/rest/EndpointsDefinition.scala | 6 +- .../rudder/rest/data/CreateNodeData.scala | 2 +- .../rest/internal/RulesInternalAPI.scala | 7 +- .../rudder/rest/lift/CampaignApi.scala | 11 +- .../rudder/rest/lift/ComplianceApi.scala | 14 +- .../rudder/rest/lift/DirectiveApi.scala | 36 ++--- .../rudder/rest/lift/GroupsApi.scala | 58 +++---- .../normation/rudder/rest/lift/HookApi.scala | 5 +- .../normation/rudder/rest/lift/InfoApi.scala | 4 +- .../rudder/rest/lift/InventoryApi.scala | 15 +- .../rudder/rest/lift/LiftApiDispatcher.scala | 10 +- .../normation/rudder/rest/lift/NodeApi.scala | 23 +-- .../rudder/rest/lift/ParametersApi.scala | 27 ++-- .../rudder/rest/lift/PluginApi.scala | 7 +- .../normation/rudder/rest/lift/RuleApi.scala | 50 +++--- .../rudder/rest/lift/SettingsApi.scala | 13 +- .../rudder/rest/lift/SystemApi.scala | 63 ++++---- .../rudder/rest/lift/TechniqueApi.scala | 40 ++--- .../normation/rudder/rest/RestTestSetUp.scala | 53 ++++--- .../rest/TraitTestApiFromYamlFiles.scala | 10 +- .../bootstrap/liftweb/RudderConfig.scala | 5 +- .../com/normation/plugins/PluginStatus.scala | 2 +- .../com/normation/plugins/PublicPlugin.scala | 2 +- .../rudder/web/comet/AsyncDeployment.scala | 2 +- .../web/components/DirectiveEditForm.scala | 6 +- .../components/NodeGroupCategoryForm.scala | 5 +- .../web/components/RuleCategoryTree.scala | 2 +- .../TechniqueCategoryEditForm.scala | 3 +- .../rudder/web/components/TechniqueTree.scala | 26 +-- .../CreateActiveTechniqueCategoryPopup.scala | 3 +- .../popup/CreateCategoryOrGroupPopup.scala | 3 +- .../popup/CreateCloneDirectivePopup.scala | 3 +- .../popup/CreateCloneGroupPopup.scala | 3 +- .../CreateOrUpdateGlobalParameterPopup.scala | 9 +- .../components/popup/CreateRulePopup.scala | 3 +- .../popup/ModificationValidationPopup.scala | 3 +- .../components/popup/RuleCategoryPopup.scala | 3 +- .../web/model/DirectiveFieldEditors.scala | 148 +++++++++--------- .../rudder/web/model/JsTreeNode.scala | 6 +- .../rudder/web/model/RudderBaseField.scala | 2 +- .../web/services/DisplayDirectiveTree.scala | 2 +- .../web/services/DisplayNodeGroupTree.scala | 2 +- .../TechniqueLibraryManagement.scala | 22 +-- .../services/Section2FieldServiceTest.scala | 2 +- 82 files changed, 574 insertions(+), 525 deletions(-) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala index b682980bbd1..f8876bbfc1f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala @@ -37,6 +37,7 @@ package com.normation.cfclerk.domain +import com.normation.cfclerk.domain.HashAlgoConstraint.DerivedPasswordType import com.normation.errors.Inconsistency import com.normation.errors.PureResult import com.normation.rudder.services.policies.PropertyParser @@ -255,10 +256,10 @@ sealed trait DerivedPasswordVType extends AbstactPassword { } case object AixDerivedPasswordVType extends DerivedPasswordVType { - override val tpe = HashAlgoConstraint.DerivedPasswordType.AIX + override val tpe: DerivedPasswordType.AIX.type = HashAlgoConstraint.DerivedPasswordType.AIX } case object LinuxDerivedPasswordVType extends DerivedPasswordVType { - override val tpe = HashAlgoConstraint.DerivedPasswordType.Linux + override val tpe: DerivedPasswordType.Linux.type = HashAlgoConstraint.DerivedPasswordType.Linux } case object BooleanVType extends VTypeConstraint with STBoolean { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala index 7736da8e3b6..183a737f18b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala @@ -181,12 +181,12 @@ trait EventLog { final case class UnspecializedEventLog( override val eventDetails: EventLogDetails ) extends EventLog { - override val eventType = UnspecializedEventLog.eventType - override val eventLogCategory = UnknownLogCategory + override val eventType = UnspecializedEventLog.eventType + override val eventLogCategory: EventLogCategory = UnknownLogCategory } object UnspecializedEventLog extends EventLogFilter { - override val eventType = UnknownEventLogType + override val eventType: EventLogType = UnknownEventLogType override def apply(x: (EventLogType, EventLogDetails)): UnspecializedEventLog = UnspecializedEventLog(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala index ea03a1b5cc1..526965ed35e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala @@ -319,13 +319,13 @@ object ApiAccountType { sealed trait ApiAccountKind { def kind: ApiAccountType } object ApiAccountKind { - final case object System extends ApiAccountKind { val kind = ApiAccountType.System } - final case object User extends ApiAccountKind { val kind = ApiAccountType.User } + final case object System extends ApiAccountKind { val kind: ApiAccountType.System.type = ApiAccountType.System } + final case object User extends ApiAccountKind { val kind = ApiAccountType.User } final case class PublicApi( authorizations: ApiAuthorization, expirationDate: Option[DateTime] ) extends ApiAccountKind { - val kind = ApiAccountType.PublicApi + val kind: ApiAccountType.PublicApi.type = ApiAccountType.PublicApi } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncWorkflowInfo.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncWorkflowInfo.scala index ead37736a95..cfc6407b1f2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncWorkflowInfo.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncWorkflowInfo.scala @@ -43,7 +43,7 @@ import net.liftweb.http.ListenerManager class AsyncWorkflowInfo extends LiftActor with ListenerManager { - def createUpdate = WorkflowUpdate + def createUpdate: WorkflowUpdate.type = WorkflowUpdate override protected def lowPriority: PartialFunction[Any, Unit] = { case WorkflowUpdate => updateListeners() } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala index 6b7e0395c13..fb3c701a1ef 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala @@ -42,7 +42,9 @@ import com.normation.rudder.domain.Constants import com.normation.rudder.git.GitArchiveId import com.normation.rudder.git.GitCommitId import scala.xml._ -sealed trait ImportExportEventLog extends EventLog { final override val eventLogCategory = ImportExportItemsLogCategory } +sealed trait ImportExportEventLog extends EventLog { + final override val eventLogCategory: EventLogCategory = ImportExportItemsLogCategory +} sealed trait ImportEventLog extends ImportExportEventLog sealed trait ExportEventLog extends ImportExportEventLog @@ -100,7 +102,7 @@ final case class ExportGroupsArchive( } object ExportGroupsArchive extends EventLogFilter { - override val eventType = ExportGroupsEventType + override val eventType: EventLogType = ExportGroupsEventType override def apply(x: (EventLogType, EventLogDetails)): ExportGroupsArchive = ExportGroupsArchive(x._2) @@ -126,7 +128,7 @@ final case class ImportGroupsArchive( } object ImportGroupsArchive extends EventLogFilter { - override val eventType = ImportGroupsEventType + override val eventType: EventLogType = ImportGroupsEventType override def apply(x: (EventLogType, EventLogDetails)): ImportGroupsArchive = ImportGroupsArchive(x._2) @@ -152,7 +154,7 @@ final case class ExportTechniqueLibraryArchive( } object ExportTechniqueLibraryArchive extends EventLogFilter { - override val eventType = ExportTechniqueLibraryEventType + override val eventType: EventLogType = ExportTechniqueLibraryEventType override def apply(x: (EventLogType, EventLogDetails)): ExportTechniqueLibraryArchive = ExportTechniqueLibraryArchive(x._2) @@ -178,7 +180,7 @@ final case class ImportTechniqueLibraryArchive( } object ImportTechniqueLibraryArchive extends EventLogFilter { - override val eventType = ImportTechniqueLibraryEventType + override val eventType: EventLogType = ImportTechniqueLibraryEventType override def apply(x: (EventLogType, EventLogDetails)): ImportTechniqueLibraryArchive = ImportTechniqueLibraryArchive(x._2) @@ -204,7 +206,7 @@ final case class ExportRulesArchive( } object ExportRulesArchive extends EventLogFilter { - override val eventType = ExportRulesEventType + override val eventType: EventLogType = ExportRulesEventType override def apply(x: (EventLogType, EventLogDetails)): ExportRulesArchive = ExportRulesArchive(x._2) @@ -230,7 +232,7 @@ final case class ImportRulesArchive( } object ImportRulesArchive extends EventLogFilter { - override val eventType = ImportRulesEventType + override val eventType: EventLogType = ImportRulesEventType override def apply(x: (EventLogType, EventLogDetails)): ImportRulesArchive = ImportRulesArchive(x._2) @@ -256,7 +258,7 @@ final case class ExportParametersArchive( } object ExportParametersArchive extends EventLogFilter { - override val eventType = ExportParametersEventType + override val eventType: EventLogType = ExportParametersEventType override def apply(x: (EventLogType, EventLogDetails)): ExportParametersArchive = ExportParametersArchive(x._2) @@ -282,7 +284,7 @@ final case class ImportParametersArchive( } object ImportParametersArchive extends EventLogFilter { - override val eventType = ImportParametersEventType + override val eventType: EventLogType = ImportParametersEventType override def apply(x: (EventLogType, EventLogDetails)): ImportParametersArchive = ImportParametersArchive(x._2) @@ -308,7 +310,7 @@ final case class ExportFullArchive( } object ExportFullArchive extends EventLogFilter { - override val eventType = ExportFullArchiveEventType + override val eventType: EventLogType = ExportFullArchiveEventType override def apply(x: (EventLogType, EventLogDetails)): ExportFullArchive = ExportFullArchive(x._2) @@ -334,7 +336,7 @@ final case class ImportFullArchive( } object ImportFullArchive extends EventLogFilter { - override val eventType = ImportFullArchiveEventType + override val eventType: EventLogType = ImportFullArchiveEventType override def apply(x: (EventLogType, EventLogDetails)): ImportFullArchive = ImportFullArchive(x._2) @@ -347,7 +349,7 @@ object ImportFullArchive extends EventLogFilter { final case class Rollback( override val eventDetails: EventLogDetails ) extends ImportEventLog { - override val eventType = RollbackEventType + override val eventType: EventLogType = RollbackEventType def this( actor: EventActor, @@ -366,7 +368,7 @@ final case class Rollback( } object Rollback extends EventLogFilter { - override val eventType = RollbackEventType + override val eventType: EventLogType = RollbackEventType override def apply(x: (EventLogType, EventLogDetails)): Rollback = Rollback(x._2) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala index 7035d0f504f..6d119d02739 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala @@ -56,7 +56,7 @@ final case class InventoryLogDetails( actorIp: String ) -sealed trait AssetEventLog extends EventLog { final override val eventLogCategory = AssetLogCategory } +sealed trait AssetEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = AssetLogCategory } sealed trait InventoryEventLog extends AssetEventLog @@ -90,7 +90,7 @@ final case class AcceptNodeEventLog( } object AcceptNodeEventLog extends EventLogFilter { - override val eventType = AcceptNodeEventType + override val eventType: EventLogType = AcceptNodeEventType override def apply(x: (EventLogType, EventLogDetails)): AcceptNodeEventLog = AcceptNodeEventLog(x._2) @@ -121,7 +121,7 @@ final case class RefuseNodeEventLog( object RefuseNodeEventLog extends EventLogFilter { - override val eventType = RefuseNodeEventType + override val eventType: EventLogType = RefuseNodeEventType override def apply(x: (EventLogType, EventLogDetails)): RefuseNodeEventLog = RefuseNodeEventLog(x._2) @@ -158,7 +158,7 @@ final case class DeleteNodeEventLog( } object DeleteNodeEventLog extends EventLogFilter { - override val eventType = DeleteNodeEventType + override val eventType: EventLogType = DeleteNodeEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteNodeEventLog = DeleteNodeEventLog(x._2) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala index bf4bb393fbe..687c46667c5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala @@ -4,17 +4,19 @@ import com.normation.eventlog._ import com.normation.rudder.domain.policies.SimpleDiff import com.normation.rudder.domain.workflows.ChangeRequest -sealed trait ChangeRequestEventLog extends EventLog { final override val eventLogCategory = ChangeRequestLogCategory } +sealed trait ChangeRequestEventLog extends EventLog { + final override val eventLogCategory: EventLogCategory = ChangeRequestLogCategory +} final case class AddChangeRequest( override val eventDetails: EventLogDetails ) extends ChangeRequestEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = AddChangeRequest.eventType } object AddChangeRequest extends EventLogFilter { - override val eventType = AddChangeRequestEventType + override val eventType: EventLogType = AddChangeRequestEventType override def apply(x: (EventLogType, EventLogDetails)): AddChangeRequest = AddChangeRequest(x._2) } @@ -22,12 +24,12 @@ object AddChangeRequest extends EventLogFilter { final case class DeleteChangeRequest( override val eventDetails: EventLogDetails ) extends ChangeRequestEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = DeleteChangeRequest.eventType } object DeleteChangeRequest extends EventLogFilter { - override val eventType = DeleteChangeRequestEventType + override val eventType: EventLogType = DeleteChangeRequestEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteChangeRequest = DeleteChangeRequest(x._2) } @@ -35,12 +37,12 @@ object DeleteChangeRequest extends EventLogFilter { final case class ModifyChangeRequest( override val eventDetails: EventLogDetails ) extends ChangeRequestEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = ModifyChangeRequest.eventType } object ModifyChangeRequest extends EventLogFilter { - override val eventType = ModifyChangeRequestEventType + override val eventType: EventLogType = ModifyChangeRequestEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyChangeRequest = ModifyChangeRequest(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala index 0540cff0f5c..b5b1cd1932b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala @@ -38,17 +38,17 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog._ -sealed trait DirectiveEventLog extends EventLog { final override val eventLogCategory = DirectiveLogCategory } +sealed trait DirectiveEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = DirectiveLogCategory } final case class AddDirective( override val eventDetails: EventLogDetails ) extends DirectiveEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = AddDirective.eventType } object AddDirective extends EventLogFilter { - override val eventType = AddDirectiveEventType + override val eventType: EventLogType = AddDirectiveEventType override def apply(x: (EventLogType, EventLogDetails)): AddDirective = AddDirective(x._2) } @@ -56,12 +56,12 @@ object AddDirective extends EventLogFilter { final case class DeleteDirective( override val eventDetails: EventLogDetails ) extends DirectiveEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = DeleteDirective.eventType } object DeleteDirective extends EventLogFilter { - override val eventType = DeleteDirectiveEventType + override val eventType: EventLogType = DeleteDirectiveEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteDirective = DeleteDirective(x._2) } @@ -69,12 +69,12 @@ object DeleteDirective extends EventLogFilter { final case class ModifyDirective( override val eventDetails: EventLogDetails ) extends DirectiveEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = ModifyDirective.eventType } object ModifyDirective extends EventLogFilter { - override val eventType = ModifyDirectiveEventType + override val eventType: EventLogType = ModifyDirectiveEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyDirective = ModifyDirective(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/GenericEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/GenericEventLog.scala index 7a5e56e2d49..a2454431fbe 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/GenericEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/GenericEventLog.scala @@ -38,6 +38,7 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog.EventLog +import com.normation.eventlog.EventLogCategory import com.normation.eventlog.EventLogDetails import com.normation.eventlog.EventLogFilter import com.normation.eventlog.EventLogType @@ -45,15 +46,15 @@ import com.normation.eventlog.EventLogType final case class ApplicationStarted( override val eventDetails: EventLogDetails ) extends EventLog { - override val cause = None - override val principal = RudderEventActor - override val eventType = ApplicationStarted.eventType - override def details = EventLog.emptyDetails - override val eventLogCategory = RudderApplicationLogCategory + override val cause: Option[Int] = None + override val principal = RudderEventActor + override val eventType = ApplicationStarted.eventType + override def details = EventLog.emptyDetails + override val eventLogCategory: EventLogCategory = RudderApplicationLogCategory } object ApplicationStarted extends EventLogFilter { - override val eventType = ApplicationStartedEventType + override val eventType: EventLogType = ApplicationStartedEventType override def apply(x: (EventLogType, EventLogDetails)): ApplicationStarted = ApplicationStarted(x._2) } @@ -65,14 +66,14 @@ final case class ActivateRedButton( override val eventDetails: EventLogDetails ) extends EventLog { - override val eventType = ActivateRedButton.eventType - override def details = EventLog.emptyDetails - override val eventLogCategory = RedButtonLogCategory + override val eventType = ActivateRedButton.eventType + override def details = EventLog.emptyDetails + override val eventLogCategory: EventLogCategory = RedButtonLogCategory } object ActivateRedButton extends EventLogFilter { - override val eventType = ActivateRedButtonEventType + override val eventType: EventLogType = ActivateRedButtonEventType override def apply(x: (EventLogType, EventLogDetails)): ActivateRedButton = ActivateRedButton(x._2) } @@ -81,14 +82,14 @@ final case class ReleaseRedButton( override val eventDetails: EventLogDetails ) extends EventLog { - override val eventType = ReleaseRedButton.eventType - override def details = EventLog.emptyDetails - override val eventLogCategory = RedButtonLogCategory + override val eventType = ReleaseRedButton.eventType + override def details = EventLog.emptyDetails + override val eventLogCategory: EventLogCategory = RedButtonLogCategory } object ReleaseRedButton extends EventLogFilter { - override val eventType = ReleaseRedButtonEventType + override val eventType: EventLogType = ReleaseRedButtonEventType override def apply(x: (EventLogType, EventLogDetails)): ReleaseRedButton = ReleaseRedButton(x._2) } @@ -100,14 +101,14 @@ final case class ClearCacheEventLog( override val eventDetails: EventLogDetails ) extends EventLog { - override val eventType = ClearCacheEventLog.eventType - override def details = EventLog.emptyDetails - override val eventLogCategory = RudderApplicationLogCategory + override val eventType = ClearCacheEventLog.eventType + override def details = EventLog.emptyDetails + override val eventLogCategory: EventLogCategory = RudderApplicationLogCategory } object ClearCacheEventLog extends EventLogFilter { - override val eventType = ClearCacheEventType + override val eventType: EventLogType = ClearCacheEventType override def apply(x: (EventLogType, EventLogDetails)): ClearCacheEventLog = ClearCacheEventLog(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala index 59593b0f57f..8c63f98028c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala @@ -6,10 +6,10 @@ final case class ModifyGlobalProperty( eventType: ModifyGlobalPropertyEventType, eventDetails: EventLogDetails ) extends EventLog { - final override val eventLogCategory = GlobalPropertyEventLogCategory + final override val eventLogCategory: EventLogCategory = GlobalPropertyEventLogCategory - override val cause = None - val propertyName = eventType.propertyName + override val cause: Option[Int] = None + val propertyName = eventType.propertyName } final case class ModifyGlobalPropertyEventFilter(eventType: ModifyGlobalPropertyEventType) extends EventLogFilter { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala index 080fce3b7f3..e7f3c2ff1b0 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala @@ -38,7 +38,7 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog._ -sealed trait NodeEventLog extends EventLog { final override val eventLogCategory = NodeLogCategory } +sealed trait NodeEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = NodeLogCategory } final case class ModifyNode( override val eventDetails: EventLogDetails @@ -47,7 +47,7 @@ final case class ModifyNode( } object ModifyNode extends EventLogFilter { - override val eventType = ModifyNodeEventType + override val eventType: EventLogType = ModifyNodeEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyNode = ModifyNode(x._2) } @@ -59,8 +59,8 @@ final case class PromoteNode( } object PromoteNode extends EventLogFilter { - override val eventType = PromoteNodeToRelayEventType - override def apply(x: (EventLogType, EventLogDetails)): PromoteNode = PromoteNode(x._2) + override val eventType: EventLogType = PromoteNodeToRelayEventType + override def apply(x: (EventLogType, EventLogDetails)): PromoteNode = PromoteNode(x._2) } final case class DemoteRelay( @@ -70,8 +70,8 @@ final case class DemoteRelay( } object DemoteRelay extends EventLogFilter { - override val eventType = DemoteRelayToNodeEventType - override def apply(x: (EventLogType, EventLogDetails)): DemoteRelay = DemoteRelay(x._2) + override val eventType: EventLogType = DemoteRelayToNodeEventType + override def apply(x: (EventLogType, EventLogDetails)): DemoteRelay = DemoteRelay(x._2) } object NodeEventLogsFilter { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala index f7731bba716..175a5ec093d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala @@ -38,17 +38,17 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog._ -sealed trait NodeGroupEventLog extends EventLog { final override val eventLogCategory = NodeGroupLogCategory } +sealed trait NodeGroupEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = NodeGroupLogCategory } final case class AddNodeGroup( override val eventDetails: EventLogDetails ) extends NodeGroupEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = AddNodeGroup.eventType } object AddNodeGroup extends EventLogFilter { - override val eventType = AddNodeGroupEventType + override val eventType: EventLogType = AddNodeGroupEventType override def apply(x: (EventLogType, EventLogDetails)): AddNodeGroup = AddNodeGroup(x._2) } @@ -56,12 +56,12 @@ object AddNodeGroup extends EventLogFilter { final case class DeleteNodeGroup( override val eventDetails: EventLogDetails ) extends NodeGroupEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = DeleteNodeGroup.eventType } object DeleteNodeGroup extends EventLogFilter { - override val eventType = DeleteNodeGroupEventType + override val eventType: EventLogType = DeleteNodeGroupEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteNodeGroup = DeleteNodeGroup(x._2) } @@ -69,12 +69,12 @@ object DeleteNodeGroup extends EventLogFilter { final case class ModifyNodeGroup( override val eventDetails: EventLogDetails ) extends NodeGroupEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = ModifyNodeGroup.eventType } object ModifyNodeGroup extends EventLogFilter { - override val eventType = ModifyNodeGroupEventType + override val eventType: EventLogType = ModifyNodeGroupEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyNodeGroup = ModifyNodeGroup(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala index ce0586546d8..6da622e14e2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala @@ -38,17 +38,17 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog._ -sealed trait ParameterEventLog extends EventLog { final override val eventLogCategory = ParameterLogCategory } +sealed trait ParameterEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = ParameterLogCategory } final case class AddGlobalParameter( override val eventDetails: EventLogDetails ) extends ParameterEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = AddGlobalParameter.eventType } object AddGlobalParameter extends EventLogFilter { - override val eventType = AddGlobalParameterEventType + override val eventType: EventLogType = AddGlobalParameterEventType override def apply(x: (EventLogType, EventLogDetails)): AddGlobalParameter = AddGlobalParameter(x._2) } @@ -56,12 +56,12 @@ object AddGlobalParameter extends EventLogFilter { final case class ModifyGlobalParameter( override val eventDetails: EventLogDetails ) extends ParameterEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = ModifyGlobalParameter.eventType } object ModifyGlobalParameter extends EventLogFilter { - override val eventType = ModifyGlobalParameterEventType + override val eventType: EventLogType = ModifyGlobalParameterEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyGlobalParameter = ModifyGlobalParameter(x._2) } @@ -69,12 +69,12 @@ object ModifyGlobalParameter extends EventLogFilter { final case class DeleteGlobalParameter( override val eventDetails: EventLogDetails ) extends ParameterEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = DeleteGlobalParameter.eventType } object DeleteGlobalParameter extends EventLogFilter { - override val eventType = DeleteGlobalParameterEventType + override val eventType: EventLogType = DeleteGlobalParameterEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteGlobalParameter = DeleteGlobalParameter(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PolicyServerEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PolicyServerEventLog.scala index a478c521209..063d87f5d43 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PolicyServerEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PolicyServerEventLog.scala @@ -1,6 +1,7 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog.EventLog +import com.normation.eventlog.EventLogCategory import com.normation.eventlog.EventLogDetails import com.normation.eventlog.EventLogFilter import com.normation.eventlog.EventLogType @@ -16,9 +17,9 @@ sealed trait PolicyServerEventLog extends EventLog final case class UpdatePolicyServer( override val eventDetails: EventLogDetails ) extends PolicyServerEventLog { - override val cause = None - override val eventType = UpdatePolicyServer.eventType - override val eventLogCategory = PolicyServerLogCategory + override val cause: Option[Int] = None + override val eventType = UpdatePolicyServer.eventType + override val eventLogCategory: EventLogCategory = PolicyServerLogCategory } final case class AuthorizedNetworkModification( @@ -27,7 +28,7 @@ final case class AuthorizedNetworkModification( ) object UpdatePolicyServer extends EventLogFilter { - override val eventType = UpdatePolicyServerEventType + override val eventType: EventLogType = UpdatePolicyServerEventType override def apply(x: (EventLogType, EventLogDetails)): UpdatePolicyServer = UpdatePolicyServer(x._2) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala index 0d432de75f6..9601dfce2d6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala @@ -38,7 +38,7 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog._ -sealed trait PromiseEventLog extends EventLog { final override val eventLogCategory = DeploymentLogCategory } +sealed trait PromiseEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = DeploymentLogCategory } final case class AutomaticStartDeployement( override val eventDetails: EventLogDetails @@ -47,7 +47,7 @@ final case class AutomaticStartDeployement( } object AutomaticStartDeployement extends EventLogFilter { - override val eventType = AutomaticStartDeployementEventType + override val eventType: EventLogType = AutomaticStartDeployementEventType override def apply(x: (EventLogType, EventLogDetails)): AutomaticStartDeployement = AutomaticStartDeployement(x._2) } @@ -59,7 +59,7 @@ final case class ManualStartDeployement( } object ManualStartDeployement extends EventLogFilter { - override val eventType = ManualStartDeployementEventType + override val eventType: EventLogType = ManualStartDeployementEventType override def apply(x: (EventLogType, EventLogDetails)): ManualStartDeployement = ManualStartDeployement(x._2) } @@ -71,7 +71,7 @@ final case class SuccessfulDeployment( } object SuccessfulDeployment extends EventLogFilter { - override val eventType = SuccessfulDeploymentEventType + override val eventType: EventLogType = SuccessfulDeploymentEventType override def apply(x: (EventLogType, EventLogDetails)): SuccessfulDeployment = SuccessfulDeployment(x._2) } @@ -83,7 +83,7 @@ final case class FailedDeployment( } object FailedDeployment extends EventLogFilter { - override val eventType = FailedDeploymentEventType + override val eventType: EventLogType = FailedDeploymentEventType override def apply(x: (EventLogType, EventLogDetails)): FailedDeployment = FailedDeployment(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala index 2cf2143e3ee..9d407cbbdba 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala @@ -38,7 +38,7 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog._ -sealed trait RuleEventLog extends EventLog { final override val eventLogCategory = RuleLogCategory } +sealed trait RuleEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = RuleLogCategory } final case class AddRule( override val eventDetails: EventLogDetails @@ -47,7 +47,7 @@ final case class AddRule( } object AddRule extends EventLogFilter { - override val eventType = AddRuleEventType + override val eventType: EventLogType = AddRuleEventType override def apply(x: (EventLogType, EventLogDetails)): AddRule = AddRule(x._2) } @@ -59,7 +59,7 @@ final case class DeleteRule( } object DeleteRule extends EventLogFilter { - override val eventType = DeleteRuleEventType + override val eventType: EventLogType = DeleteRuleEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteRule = DeleteRule(x._2) } @@ -71,7 +71,7 @@ final case class ModifyRule( } object ModifyRule extends EventLogFilter { - override val eventType = ModifyRuleEventType + override val eventType: EventLogType = ModifyRuleEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyRule = ModifyRule(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/SecretEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/SecretEventLog.scala index 45c700cbaa4..304e70f6173 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/SecretEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/SecretEventLog.scala @@ -37,6 +37,7 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog.EventLog +import com.normation.eventlog.EventLogCategory import com.normation.eventlog.EventLogDetails import com.normation.eventlog.EventLogFilter import com.normation.eventlog.EventLogType @@ -45,17 +46,17 @@ import com.normation.rudder.domain.secret.Secret //final case class Secret(name: String, value: String, description: String) -sealed trait SecretEventLog extends EventLog { final override val eventLogCategory = SecretLogCategory } +sealed trait SecretEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = SecretLogCategory } final case class AddSecret( override val eventDetails: EventLogDetails ) extends SecretEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = AddSecret.eventType } object AddSecret extends EventLogFilter { - override val eventType = AddSecretEventType + override val eventType: EventLogType = AddSecretEventType override def apply(x: (EventLogType, EventLogDetails)): AddSecret = AddSecret(x._2) } @@ -63,12 +64,12 @@ object AddSecret extends EventLogFilter { final case class ModifySecret( override val eventDetails: EventLogDetails ) extends SecretEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = ModifySecret.eventType } object ModifySecret extends EventLogFilter { - override val eventType = ModifySecretEventType + override val eventType: EventLogType = ModifySecretEventType override def apply(x: (EventLogType, EventLogDetails)): ModifySecret = ModifySecret(x._2) } @@ -76,12 +77,12 @@ object ModifySecret extends EventLogFilter { final case class DeleteSecret( override val eventDetails: EventLogDetails ) extends SecretEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = DeleteSecret.eventType } object DeleteSecret extends EventLogFilter { - override val eventType = DeleteSecretEventType + override val eventType: EventLogType = DeleteSecretEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteSecret = DeleteSecret(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala index c78d079605e..d87630de43d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala @@ -49,17 +49,17 @@ import com.normation.eventlog.EventLogDetails import com.normation.rudder.domain.Constants import scala.xml._ -sealed trait TechniqueEventLog extends EventLog { final override val eventLogCategory = TechniqueLogCategory } +sealed trait TechniqueEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = TechniqueLogCategory } final case class ReloadTechniqueLibrary( override val eventDetails: EventLogDetails ) extends TechniqueEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = ReloadTechniqueLibrary.eventType } object ReloadTechniqueLibrary extends EventLogFilter { - override val eventType = ReloadTechniqueLibraryType + override val eventType: EventLogType = ReloadTechniqueLibraryType override def apply(x: (EventLogType, EventLogDetails)): ReloadTechniqueLibrary = ReloadTechniqueLibrary(x._2) @@ -122,35 +122,35 @@ object TechniqueEventLogsFilter { final case class AddTechnique( override val eventDetails: EventLogDetails ) extends TechniqueEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = AddTechnique.eventType } object AddTechnique extends EventLogFilter { - override val eventType = AddTechniqueEventType + override val eventType: EventLogType = AddTechniqueEventType override def apply(x: (EventLogType, EventLogDetails)): AddTechnique = AddTechnique(x._2) } final case class ModifyTechnique( override val eventDetails: EventLogDetails ) extends TechniqueEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = ModifyTechnique.eventType } object ModifyTechnique extends EventLogFilter { - override val eventType = ModifyTechniqueEventType + override val eventType: EventLogType = ModifyTechniqueEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyTechnique = ModifyTechnique(x._2) } final case class DeleteTechnique( override val eventDetails: EventLogDetails ) extends TechniqueEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = DeleteTechnique.eventType } object DeleteTechnique extends EventLogFilter { - override val eventType = DeleteTechniqueEventType + override val eventType: EventLogType = DeleteTechniqueEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteTechnique = DeleteTechnique(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/UserEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/UserEventLog.scala index 1ea9c791838..9925f1e9ca2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/UserEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/UserEventLog.scala @@ -38,13 +38,14 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog.EventLog +import com.normation.eventlog.EventLogCategory import com.normation.eventlog.EventLogDetails import com.normation.eventlog.EventLogFilter import com.normation.eventlog.EventLogType sealed trait UserEventLog extends EventLog { - final override val details = EventLog.emptyDetails - final override val eventLogCategory = UserLogCategory + final override val details = EventLog.emptyDetails + final override val eventLogCategory: EventLogCategory = UserLogCategory } final case class LoginEventLog( @@ -55,7 +56,7 @@ final case class LoginEventLog( } object LoginEventLog extends EventLogFilter { - override val eventType = LoginEventType + override val eventType: EventLogType = LoginEventType override def apply(x: (EventLogType, EventLogDetails)): LoginEventLog = LoginEventLog(x._2) } @@ -68,7 +69,7 @@ final case class BadCredentialsEventLog( } object BadCredentialsEventLog extends EventLogFilter { - override val eventType = BadCredentialsEventType + override val eventType: EventLogType = BadCredentialsEventType override def apply(x: (EventLogType, EventLogDetails)): BadCredentialsEventLog = BadCredentialsEventLog(x._2) } @@ -81,7 +82,7 @@ final case class LogoutEventLog( } object LogoutEventLog extends EventLogFilter { - override val eventType = LogoutEventType + override val eventType: EventLogType = LogoutEventType override def apply(x: (EventLogType, EventLogDetails)): LogoutEventLog = LogoutEventLog(x._2) } @@ -91,7 +92,7 @@ object LogoutEventLog extends EventLogFilter { /////////////////////////////// sealed trait APIAccountEventLog extends EventLog { - final override val eventLogCategory = APIAccountCategory + final override val eventLogCategory: EventLogCategory = APIAccountCategory } final case class CreateAPIAccountEventLog( @@ -102,7 +103,7 @@ final case class CreateAPIAccountEventLog( } object CreateAPIAccountEventLog extends EventLogFilter { - override val eventType = CreateAPIAccountEventType + override val eventType: EventLogType = CreateAPIAccountEventType override def apply(x: (EventLogType, EventLogDetails)): CreateAPIAccountEventLog = CreateAPIAccountEventLog(x._2) } @@ -115,7 +116,7 @@ final case class DeleteAPIAccountEventLog( } object DeleteAPIAccountEventLog extends EventLogFilter { - override val eventType = DeleteAPIAccountEventType + override val eventType: EventLogType = DeleteAPIAccountEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteAPIAccountEventLog = DeleteAPIAccountEventLog(x._2) } @@ -128,7 +129,7 @@ final case class ModifyAPIAccountEventLog( } object ModifyAPIAccountEventLog extends EventLogFilter { - override val eventType = ModifyAPITokenEventType + override val eventType: EventLogType = ModifyAPITokenEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyAPIAccountEventLog = ModifyAPIAccountEventLog(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala index 17fa0675646..196f513e5c1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala @@ -1,17 +1,17 @@ package com.normation.rudder.domain.eventlog import com.normation.eventlog._ -sealed trait WorkflowEventLog extends EventLog { final override val eventLogCategory = WorkflowLogCategory } +sealed trait WorkflowEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = WorkflowLogCategory } final case class WorkflowStepChanged( override val eventDetails: EventLogDetails ) extends WorkflowEventLog { - override val cause = None + override val cause: Option[Int] = None override val eventType = WorkflowStepChanged.eventType } object WorkflowStepChanged extends EventLogFilter { - override val eventType = WorkflowStepChangedEventType + override val eventType: EventLogType = WorkflowStepChangedEventType override def apply(x: (EventLogType, EventLogDetails)): WorkflowStepChanged = WorkflowStepChanged(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala index 256fd33b38d..a2ca263a0de 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala @@ -76,7 +76,7 @@ object ComplianceDebugLogger extends Logger { .expireAfterWrite(10, TimeUnit.MINUTES) .build( new CacheLoader[String, Logger]() { - def load(key: String) = { + def load(key: String): Logger = { new Logger() { override protected def _logger = LoggerFactory.getLogger(s"explain_compliance.${key}") } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala index b642a179f14..0a1a3ca960d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala @@ -514,39 +514,39 @@ trait NodeCriterionOrderedValueMatcher[A] extends NodeCriterionMatcher { final case class NodeCriterionMatcherString(extractor: CoreNodeFact => Chunk[String]) extends NodeCriterionOrderedValueMatcher[String] { - override def parseNum(value: String): Option[String] = Some(value) - override def serialise(a: String): String = a - val order = Ordering.String + override def parseNum(value: String): Option[String] = Some(value) + override def serialise(a: String): String = a + val order: Ordering[String] = Ordering.String } final case class NodeCriterionMatcherInt(extractor: CoreNodeFact => Chunk[Int]) extends NodeCriterionOrderedValueMatcher[Int] { - override def parseNum(value: String): Option[Int] = try { Some(Integer.parseInt(value)) } + override def parseNum(value: String): Option[Int] = try { Some(Integer.parseInt(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Int): String = a.toString - val order = Ordering.Int + override def serialise(a: Int): String = a.toString + val order: Ordering[Int] = Ordering.Int } final case class NodeCriterionMatcherLong(extractor: CoreNodeFact => Chunk[Long]) extends NodeCriterionOrderedValueMatcher[Long] { - override def parseNum(value: String): Option[Long] = try { Some(java.lang.Long.parseLong(value)) } + override def parseNum(value: String): Option[Long] = try { Some(java.lang.Long.parseLong(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Long): String = a.toString - val order = Ordering.Long + override def serialise(a: Long): String = a.toString + val order: Ordering[Long] = Ordering.Long } final case class NodeCriterionMatcherFloat(extractor: CoreNodeFact => Chunk[Float]) extends NodeCriterionOrderedValueMatcher[Float] { - override def parseNum(value: String): Option[Float] = try { Some(java.lang.Float.parseFloat(value)) } + override def parseNum(value: String): Option[Float] = try { Some(java.lang.Float.parseFloat(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Float): String = a.toString - val order = Ordering.Float.TotalOrdering + override def serialise(a: Float): String = a.toString + val order: Ordering[Float] = Ordering.Float.TotalOrdering } final case class NodeCriterionMatcherDouble(extractor: CoreNodeFact => Chunk[Double]) extends NodeCriterionOrderedValueMatcher[Double] { - override def parseNum(value: String): Option[Double] = try { Some(java.lang.Double.parseDouble(value)) } + override def parseNum(value: String): Option[Double] = try { Some(java.lang.Double.parseDouble(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Double): String = a.toString - val order = Ordering.Double.TotalOrdering + override def serialise(a: Double): String = a.toString + val order: Ordering[Double] = Ordering.Double.TotalOrdering } final case class NodeCriterionMatcherDate(extractorNode: CoreNodeFact => Chunk[DateTime]) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala index 4bcf7cf86e8..c98a0143f33 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala @@ -123,7 +123,7 @@ class SimpleGitRevisionProvider(refPath: String, repo: GitRepositoryProvider) ex } } - override def currentRevTreeId = currentId.get + override def currentRevTreeId: UIO[ObjectId] = currentId.get override def setCurrentRevTreeId(id: ObjectId): IOResult[Unit] = { currentId.set(id) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala index e60c00397d0..86f0de569a0 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala @@ -636,13 +636,13 @@ class UpdatePiOnActiveTechniqueEvent( ptName: TechniqueName, getParents: List[ActiveTechniqueCategoryId], gitCommit: Option[(ModificationId, PersonIdent, Option[String])] - ) = ZIO.unit + ): UIO[Unit] = ZIO.unit override def onMove( activeTechnique: ActiveTechnique, oldParents: List[ActiveTechniqueCategoryId], newParents: List[ActiveTechniqueCategoryId], gitCommit: Option[(ModificationId, PersonIdent, Option[String])] - ) = ZIO.unit + ): UIO[Unit] = ZIO.unit } /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala index 64ce9f9ab7a..2cf67565da8 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala @@ -390,11 +390,17 @@ sealed trait QuickSearchResultId extends Any { def value: String; def tpe: QSObj object QuickSearchResultId { import QSObject._ - final case class QRNodeId(value: String) extends AnyVal with QuickSearchResultId { override def tpe = Node } - final case class QRGroupId(value: String) extends AnyVal with QuickSearchResultId { override def tpe = Group } - final case class QRDirectiveId(value: String) extends AnyVal with QuickSearchResultId { override def tpe = Directive } - final case class QRParameterId(value: String) extends AnyVal with QuickSearchResultId { override def tpe = Parameter } - final case class QRRuleId(value: String) extends AnyVal with QuickSearchResultId { override def tpe = Rule } + final case class QRNodeId(value: String) extends AnyVal with QuickSearchResultId { override def tpe: QSObject.Node.type = Node } + final case class QRGroupId(value: String) extends AnyVal with QuickSearchResultId { + override def tpe: QSObject.Group.type = Group + } + final case class QRDirectiveId(value: String) extends AnyVal with QuickSearchResultId { + override def tpe: QSObject.Directive.type = Directive + } + final case class QRParameterId(value: String) extends AnyVal with QuickSearchResultId { + override def tpe: QSObject.Parameter.type = Parameter + } + final case class QRRuleId(value: String) extends AnyVal with QuickSearchResultId { override def tpe: QSObject.Rule.type = Rule } } final case class QuickSearchResult( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala index 8479c8a4803..577a49cb326 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala @@ -225,7 +225,7 @@ final case class UnexpectedNoVersion( expectedExpiration: DateTime, expirationDateTime: DateTime ) extends Unexpected with LastRunAvailable { - val lastRunConfigInfo = None + val lastRunConfigInfo: Option[NodeExpectedReports] = None } /** @@ -241,7 +241,7 @@ final case class UnexpectedUnknownVersion( expectedExpiration: DateTime, expirationDateTime: DateTime ) extends Unexpected with LastRunAvailable { - val lastRunConfigInfo = None + val lastRunConfigInfo: Option[NodeExpectedReports] = None } final case class ComputeCompliance( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala index ff6490e68ad..604fe7ebbaf 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala @@ -212,8 +212,8 @@ class CommitAndDeployChangeRequestServiceImpl( def failureMessage(rule: Rule) = s"Rule ${rule.name} (id: ${rule.id.serialize})" def getCurrentValue(rule: Rule) = roRuleRepository.get(rule.id).toBox def compareMethod(initial: Rule, current: Rule) = CheckDivergenceForMerge.compareRules(initial, current) - def xmlSerialize(rule: Rule) = Full(xmlSerializer.rule.serialise(rule)) - def xmlUnserialize(xml: Node) = xmlUnserializer.rule.unserialise(xml) + def xmlSerialize(rule: Rule): Box[Node] = Full(xmlSerializer.rule.serialise(rule)) + def xmlUnserialize(xml: Node) = xmlUnserializer.rule.unserialise(xml) } // For now we only check the Directive, not the SectionSpec and the TechniqueName. @@ -246,8 +246,8 @@ class CommitAndDeployChangeRequestServiceImpl( def failureMessage(group: NodeGroup) = s"Group ${group.name} (id: ${group.id.serialize})" def getCurrentValue(group: NodeGroup) = roNodeGroupRepo.getNodeGroup(group.id).map(_._1).toBox def compareMethod(initial: NodeGroup, current: NodeGroup) = CheckDivergenceForMerge.compareGroups(initial, current) - def xmlSerialize(group: NodeGroup) = Full(xmlSerializer.group.serialise(group)) - def xmlUnserialize(xml: Node) = xmlUnserializer.group.unserialise(xml) + def xmlSerialize(group: NodeGroup): Box[Node] = Full(xmlSerializer.group.serialise(group)) + def xmlUnserialize(xml: Node) = xmlUnserializer.group.unserialise(xml) } case object CheckGlobalParameter extends CheckChanges[GlobalParameter] { @@ -256,8 +256,8 @@ class CommitAndDeployChangeRequestServiceImpl( roParameterRepository.getGlobalParameter(param.name).notOptional(s"Parameter '${param.name}' was not found").toBox def compareMethod(initial: GlobalParameter, current: GlobalParameter) = CheckDivergenceForMerge.compareGlobalParameter(initial, current) - def xmlSerialize(param: GlobalParameter) = Full(xmlSerializer.globalParam.serialise(param)) - def xmlUnserialize(xml: Node) = xmlUnserializer.globalParam.unserialise(xml) + def xmlSerialize(param: GlobalParameter): Box[Node] = Full(xmlSerializer.globalParam.serialise(param)) + def xmlUnserialize(xml: Node) = xmlUnserializer.globalParam.unserialise(xml) } /* diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala index 613a469c39e..35d63c65917 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala @@ -136,9 +136,9 @@ class DummyTechniqueRepository(policies: Seq[Technique] = Seq()) extends Techniq policyMap.get(TechniqueId(policyName, TechniqueVersionHelper("1.0"))) } - override def getByName(policyName: TechniqueName) = ??? + override def getByName(policyName: TechniqueName): Map[TechniqueVersion, Technique] = ??? - override def getTechniquesInfo() = ??? + override def getTechniquesInfo(): TechniquesInfo = ??? override def getTechniqueVersions(name: TechniqueName): SortedSet[TechniqueVersion] = SortedSet.empty[TechniqueVersion] diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala index 77905465687..18f1a0b19c5 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala @@ -282,10 +282,10 @@ trait JGitPackageReaderSpec extends Specification with Loggable with AfterAll { */ @RunWith(classOf[JUnitRunner]) class JGitPackageReader_SameRootTest extends JGitPackageReaderSpec { - lazy val gitRoot = new File("/tmp/test-jgit-" + DateTime.now().toString()) - lazy val ptLib = gitRoot - lazy val relativePathArg = None - def postInitHook(): Unit = {} + lazy val gitRoot = new File("/tmp/test-jgit-" + DateTime.now().toString()) + lazy val ptLib = gitRoot + lazy val relativePathArg: Option[String] = None + def postInitHook(): Unit = {} } /** diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala index 0ed4ab189be..5d3256b7513 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala @@ -46,6 +46,7 @@ import com.normation.eventlog.ModificationId import com.normation.rudder.db.DB import com.normation.rudder.git.GitCommitId import com.normation.rudder.git.GitConfigItemRepository +import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.git.GitRepositoryProviderImpl import com.normation.rudder.repository.GitModificationRepository import com.normation.rudder.repository.xml.RudderPrettyPrinter @@ -96,8 +97,8 @@ class JGitRepositoryTest extends Specification with Loggable with AfterAll { val repo: GitRepositoryProviderImpl = GitRepositoryProviderImpl.make(gitRoot.pathAsString).runNow val archive: GitConfigItemRepository with XmlArchiverUtils = new GitConfigItemRepository with XmlArchiverUtils { - override val gitRepo = repo - override def relativePath: String = "" + override val gitRepo: GitRepositoryProvider = repo + override def relativePath: String = "" override def xmlPrettyPrinter = new RudderPrettyPrinter(Int.MaxValue, 2) override def encoding: String = "UTF-8" override def gitModificationRepository: GitModificationRepository = new GitModificationRepository { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala index c7da1f46a00..eaee81927e7 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala @@ -2953,8 +2953,8 @@ sealed trait DumbCampaignTrait extends Campaign @jsonHint(DumbCampaignType.value) final case class DumbCampaign(info: CampaignInfo, details: DumbCampaignDetails) extends DumbCampaignTrait { - val campaignType = DumbCampaignType - val version = 1 + val campaignType: CampaignType = DumbCampaignType + val version = 1 def copyWithId(newId: CampaignId): Campaign = this.copy(info = info.copy(id = newId)) } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala index 20e17a0af9e..1fc21d8f05f 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala @@ -147,7 +147,7 @@ class TestSaveInventoryLdap extends TestSaveInventory { override def checkAcceptedNodeExists(id: String): Boolean = nodeExists(id, MockLdapFactStorage.acceptedDIT) override def getAcceptedNodeAsString(id: String): String = nodeAsString(id, MockLdapFactStorage.acceptedDIT) - override lazy val factStorage = MockLdapFactStorage.nodeFactStorage + override lazy val factStorage: NodeFactStorage = MockLdapFactStorage.nodeFactStorage //////// for LDAP reposiotyr, in addition to main acceptation test, we are //////// checking properties around certificate validation diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala index af16ff0beae..9e08c07612f 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala @@ -116,7 +116,7 @@ class TestDbMigration_5_6 extends DBCommon with XmlMatchers { doobie = doobie, batchSize = 2 ) { - override val errorLogger = (f: Failure) => throw new MigEx102(f.messageChain) + override val errorLogger: Failure => Unit = (f: Failure) => throw new MigEx102(f.messageChain) } var logs5WithId: Map[String, MigrationTestLog] = null // init in initDb diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala index f36f6cc3af6..5a52b81ae00 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala @@ -207,8 +207,8 @@ class ReportingServiceTest extends DBCommon with BoxSpecMatcher { lazy val dummyChangesCache: CachedNodeChangesServiceImpl = { new CachedNodeChangesServiceImpl(new NodeChangesServiceImpl(reportsRepo), () => Full(true)) { - override def update(lowestId: Long, highestId: Long): Box[Unit] = Full(()) - override def countChangesByRuleByInterval() = Empty + override def update(lowestId: Long, highestId: Long): Box[Unit] = Full(()) + override def countChangesByRuleByInterval(): Box[(Long, ChangesByRule)] = Empty } } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala index 981559bbfe7..29506129644 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala @@ -49,6 +49,7 @@ import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.RudderLDAPConstants._ import com.normation.rudder.domain.properties.GenericProperty._ import com.normation.rudder.domain.properties.GlobalParameter +import com.normation.rudder.domain.queries.ObjectCriterion import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.rudder.services.queries.DefaultStringQueryParser import com.normation.rudder.services.queries.JsonQueryLexer @@ -96,7 +97,9 @@ class GlobalParamMigration61Test extends Specification { val rudderDit = new RudderDit(new DN("ou=Rudder, cn=rudder-configuration")) val nodeDit = new NodeDit(new DN("ou=Nodes, ou=Rudder, cn=rudder-configuration")) - val cmdbQueryParser = new CmdbQueryParser with DefaultStringQueryParser with JsonQueryLexer { val criterionObjects = Map() } + val cmdbQueryParser = new CmdbQueryParser with DefaultStringQueryParser with JsonQueryLexer { + val criterionObjects: Map[String, ObjectCriterion] = Map() + } new LDAPEntityMapper(rudderDit, nodeDit, acceptedNodesDitImpl, cmdbQueryParser, inventoryMapper) } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala index 71b9cb8bab8..e7bf6330ae2 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala @@ -50,6 +50,7 @@ import com.normation.ldap.sdk.LDAPEntry import com.normation.rudder.domain.NodeDit import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.nodes.NodeInfo +import com.normation.rudder.domain.queries.ObjectCriterion import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.rudder.services.queries.DefaultStringQueryParser import com.normation.rudder.services.queries.JsonQueryLexer @@ -90,7 +91,9 @@ class InventoryNodeInfoCompatTest extends Specification { val rudderDit = new RudderDit(new DN("ou=Rudder, cn=rudder-configuration")) val nodeDit = new NodeDit(new DN("ou=Nodes, ou=Rudder, cn=rudder-configuration")) - val cmdbQueryParser = new CmdbQueryParser with DefaultStringQueryParser with JsonQueryLexer { val criterionObjects = Map() } + val cmdbQueryParser = new CmdbQueryParser with DefaultStringQueryParser with JsonQueryLexer { + val criterionObjects: Map[String, ObjectCriterion] = Map() + } new LDAPEntityMapper(rudderDit, nodeDit, acceptedNodesDitImpl, cmdbQueryParser, inventoryMapper) } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala index 9b4874e3981..073bf66b2e2 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala @@ -3076,11 +3076,11 @@ class ExecutionBatchTest extends Specification { "Compliance for cfengine vars and reports" should { sealed trait Kind { def tpe: ReportType } - case object Success extends Kind { val tpe = EnforceSuccess } - case object Repaired extends Kind { val tpe = EnforceRepaired } - case object Error extends Kind { val tpe = EnforceError } - case object Missing extends Kind { val tpe = ReportType.Missing } - case object Unexpected extends Kind { val tpe = ReportType.Unexpected } + case object Success extends Kind { val tpe: ReportType = EnforceSuccess } + case object Repaired extends Kind { val tpe: ReportType = EnforceRepaired } + case object Error extends Kind { val tpe: ReportType = EnforceError } + case object Missing extends Kind { val tpe: ReportType = ReportType.Missing } + case object Unexpected extends Kind { val tpe: ReportType = ReportType.Unexpected } /* * Values are expected values with the corresponding status list diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala index 318bc5f2a83..c3dfa81c977 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala @@ -269,9 +269,9 @@ trait StartsAtVersion19 extends EndpointSchema { val versions: ApiV.From = ApiV. trait StartsAtVersion20 extends EndpointSchema { val versions: ApiV.From = ApiV.From(20) } // utility extension trait to define the kind of API -trait PublicApi extends EndpointSchema { val kind = ApiKind.Public } -trait InternalApi extends EndpointSchema { val kind = ApiKind.Internal } -trait GeneralApi extends EndpointSchema { val kind = ApiKind.General } +trait PublicApi extends EndpointSchema { val kind: ApiKind.Public.type = ApiKind.Public } +trait InternalApi extends EndpointSchema { val kind: ApiKind.Internal.type = ApiKind.Internal } +trait GeneralApi extends EndpointSchema { val kind: ApiKind.General.type = ApiKind.General } // An utility that compare a schema path and a provided one, and returns // exactly the number of asked elements. diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala index 12436dcfd85..20c92644b2c 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala @@ -103,7 +103,7 @@ object CampaignApi extends ApiModuleProvider[CampaignApi] { val z: Int = implicitly[Line].value val description = "Delete a campaign" val (action, path) = DELETE / "campaigns" / "{id}" - val dataContainer = None + val dataContainer: Option[String] = None } final case object GetCampaignEventsForModel extends CampaignApi with OneParam with StartsAtVersion16 with SortIndex { val z: Int = implicitly[Line].value @@ -121,7 +121,7 @@ object CampaignApi extends ApiModuleProvider[CampaignApi] { val z: Int = implicitly[Line].value val description = "Delete a campaign event" val (action, path) = DELETE / "campaigns" / "events" / "{id}" - val dataContainer = None + val dataContainer: Option[String] = None } def endpoints: List[CampaignApi] = ca.mrvisser.sealerate.values[CampaignApi].toList.sortBy(_.z) } @@ -191,7 +191,7 @@ object ComplianceApi extends ApiModuleProvider[ComplianceApi] { val z = implicitly[Line].value val description = "Get a node group's compliance summary" val (action, path) = GET / "compliance" / "summary" / "groups" - val dataContainer = Some("groupCompliance") + val dataContainer: Some[String] = Some("groupCompliance") } final case object GetNodeGroupComplianceId diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala index f1a7ad1b88d..aece89af724 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala @@ -319,7 +319,7 @@ object Validation { } } object Machine { - case object MPhysical extends Machine { val tpe = PhysicalMachineType } + case object MPhysical extends Machine { val tpe: MachineType = PhysicalMachineType } case object MUnknownVmType extends Machine { val tpe: VirtualMachineType = VirtualMachineType(UnknownVmType) } case object MSolarisZone extends Machine { val tpe: VirtualMachineType = VirtualMachineType(SolarisZone) } case object MVirtualBox extends Machine { val tpe: VirtualMachineType = VirtualMachineType(VirtualBox) } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala index 5bba78ea4f3..0065d8e9e04 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala @@ -13,6 +13,7 @@ import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.RoRuleRepository import com.normation.rudder.rest.{RuleInternalApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.implicits._ @@ -30,7 +31,7 @@ class RulesInternalApi( ruleApiService: RuleApiService14 ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints.map(e => { @@ -42,7 +43,7 @@ class RulesInternalApi( } object GetRuleNodesAndDirectives extends LiftApiModuleString { - val schema = API.GetRuleNodesAndDirectives + val schema: API.GetRuleNodesAndDirectives.type = API.GetRuleNodesAndDirectives def process( version: ApiVersion, @@ -63,7 +64,7 @@ class RulesInternalApi( } object GetGroupRelatedRules extends LiftApiModule0 { - val schema = API.GetGroupRelatedRules + val schema: API.GetGroupRelatedRules.type = API.GetGroupRelatedRules /** * Request takes an optional query parameter list to filter rules in the tree diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala index 325ed5c07ef..cebbb836159 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala @@ -14,6 +14,7 @@ import com.normation.rudder.campaigns.CampaignSerializer._ import com.normation.rudder.campaigns.CampaignStatusValue import com.normation.rudder.campaigns.MainCampaignService import com.normation.rudder.rest.{CampaignApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.OneParam @@ -38,7 +39,7 @@ class CampaignApi( stringUuidGenerator: StringUuidGenerator ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints.map(e => { @@ -57,7 +58,7 @@ class CampaignApi( }) } object GetCampaigns extends LiftApiModule0 { - val schema = API.GetCampaigns + val schema: API.GetCampaigns.type = API.GetCampaigns def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { val campaignType = req.params.get("campaignType").getOrElse(Nil).map(campaignSerializer.campaignType) @@ -197,8 +198,8 @@ class CampaignApi( } object SaveCampaign extends LiftApiModule0 { - val schema = API.SaveCampaign - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.SaveCampaign.type = API.SaveCampaign + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { // copied from `Req.forcedBodyAsJson` def r = """; *charset=(.*)""".r @@ -224,7 +225,7 @@ class CampaignApi( } object GetCampaignEvents extends LiftApiModule0 { - val schema = API.GetCampaignEvents + val schema: API.GetCampaignEvents.type = API.GetCampaignEvents def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { val states = req.params.get("state").getOrElse(Nil) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala index 86877ef08d8..e0a445c0807 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala @@ -103,7 +103,7 @@ class ComplianceApi( import CsvCompliance._ import JsonCompliance._ - def schemas = API + def schemas: ApiModuleProvider[API] = API /* * The actual builder for the compliance API. @@ -134,7 +134,7 @@ class ComplianceApi( } object GetRules extends LiftApiModule0 { - val schema = API.GetRulesCompliance + val schema: API.GetRulesCompliance.type = API.GetRulesCompliance val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = schema.name @@ -221,7 +221,7 @@ class ComplianceApi( } object GetDirectiveId extends LiftApiModule { - val schema = API.GetDirectiveComplianceId + val schema: API.GetDirectiveComplianceId.type = API.GetDirectiveComplianceId val restExtractor = restExtractorService def process( @@ -270,7 +270,7 @@ class ComplianceApi( } object GetDirectives extends LiftApiModule0 { - val schema = API.GetDirectivesCompliance + val schema: API.GetDirectivesCompliance.type = API.GetDirectivesCompliance val restExtractor = restExtractorService def process0( @@ -317,7 +317,7 @@ class ComplianceApi( } object GetNodeGroupSummary extends LiftApiModule0 { - val schema = API.GetNodeGroupComplianceSummary + val schema: API.GetNodeGroupComplianceSummary.type = API.GetNodeGroupComplianceSummary val restExtractor = restExtractorService def process0( version: ApiVersion, @@ -422,7 +422,7 @@ class ComplianceApi( } object GetNodes extends LiftApiModule0 { - val schema = API.GetNodesCompliance + val schema: API.GetNodesCompliance.type = API.GetNodesCompliance val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = schema.name @@ -521,7 +521,7 @@ class ComplianceApi( } object GetGlobal extends LiftApiModule0 { - val schema = API.GetGlobalCompliance + val schema: API.GetGlobalCompliance.type = API.GetGlobalCompliance val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = schema.name diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala index ba728cebed9..4214667bcb2 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala @@ -105,7 +105,7 @@ class DirectiveApi( private val dataName = "directives" - def schemas = API + def schemas: ApiModuleProvider[API] = API def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit action: String @@ -153,7 +153,7 @@ class DirectiveApi( } object ListDirective extends LiftApiModule0 { - val schema = API.ListDirectives + val schema: API.ListDirectives.type = API.ListDirectives val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = "listDirectives" @@ -162,7 +162,7 @@ class DirectiveApi( } object DirectiveDetails extends LiftApiModuleString { - val schema = API.DirectiveDetails + val schema: API.DirectiveDetails.type = API.DirectiveDetails val restExtractor = restExtractorService def process( version: ApiVersion, @@ -178,7 +178,7 @@ class DirectiveApi( } object CreateDirective extends LiftApiModule0 { - val schema = API.CreateDirective + val schema: API.CreateDirective.type = API.CreateDirective val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { var action = "createDirective" @@ -203,7 +203,7 @@ class DirectiveApi( } object DeleteDirective extends LiftApiModuleString { - val schema = API.DeleteDirective + val schema: API.DeleteDirective.type = API.DeleteDirective val restExtractor = restExtractorService def process( version: ApiVersion, @@ -226,7 +226,7 @@ class DirectiveApi( } object CheckDirective extends LiftApiModuleString { - val schema = API.CheckDirective + val schema: API.CheckDirective.type = API.CheckDirective val restExtractor = restExtractorService def process( version: ApiVersion, @@ -249,7 +249,7 @@ class DirectiveApi( } object UpdateDirective extends LiftApiModuleString { - val schema = API.UpdateDirective + val schema: API.UpdateDirective.type = API.UpdateDirective val restExtractor = restExtractorService def process( version: ApiVersion, @@ -280,14 +280,14 @@ class DirectiveApi( } object ListDirectiveV14 extends LiftApiModule0 { - val schema = API.ListDirectives - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.ListDirectives.type = API.ListDirectives + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV14.listDirectives().toLiftResponseList(params, schema) } } object DirectiveTree extends LiftApiModule0 { - val schema = API.DirectiveTree - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.DirectiveTree.type = API.DirectiveTree + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { (for { includeSystem <- restExtractorService.extractBoolean("includeSystem")(req)(identity).toIO res <- serviceV14.directiveTree(includeSystem.getOrElse(false)) @@ -298,7 +298,7 @@ class DirectiveApi( } object DirectiveDetailsV14 extends LiftApiModuleString { - val schema = API.DirectiveDetails + val schema: API.DirectiveDetails.type = API.DirectiveDetails def process( version: ApiVersion, path: ApiPath, @@ -315,7 +315,7 @@ class DirectiveApi( } object DirectiveRevisionsV14 extends LiftApiModuleString { - val schema = API.DirectiveRevisions + val schema: API.DirectiveRevisions.type = API.DirectiveRevisions def process( version: ApiVersion, path: ApiPath, @@ -329,8 +329,8 @@ class DirectiveApi( } object CreateDirectiveV14 extends LiftApiModule0 { - val schema = API.CreateDirective - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.CreateDirective.type = API.CreateDirective + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { (for { restDirective <- @@ -351,7 +351,7 @@ class DirectiveApi( } object UpdateDirectiveV14 extends LiftApiModuleString { - val schema = API.UpdateDirective + val schema: API.UpdateDirective.type = API.UpdateDirective def process( version: ApiVersion, path: ApiPath, @@ -371,7 +371,7 @@ class DirectiveApi( } object DeleteDirectiveV14 extends LiftApiModuleString { - val schema = API.DeleteDirective + val schema: API.DeleteDirective.type = API.DeleteDirective def process( version: ApiVersion, path: ApiPath, @@ -385,7 +385,7 @@ class DirectiveApi( } object CheckDirectiveV14 extends LiftApiModuleString { - val schema = API.CheckDirective + val schema: API.CheckDirective.type = API.CheckDirective def process( version: ApiVersion, path: ApiPath, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala index 2639ce0e8ee..2031a0907c5 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala @@ -93,7 +93,7 @@ class GroupsApi( inheritedProperties: GroupApiInheritedProperties ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API /* * The actual builder for the compliance API. @@ -123,13 +123,13 @@ class GroupsApi( } object List extends LiftApiModule0 { - val schema = API.ListGroups - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.ListGroups.type = API.ListGroups + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV14.listGroups().toLiftResponseList(params, schema) } } object Get extends LiftApiModuleString { - val schema = API.GroupDetails + val schema: API.GroupDetails.type = API.GroupDetails def process( version: ApiVersion, path: ApiPath, @@ -146,7 +146,7 @@ class GroupsApi( } object GroupInheritedProperties extends LiftApiModuleString { - val schema = API.GroupInheritedProperties + val schema: API.GroupInheritedProperties.type = API.GroupInheritedProperties val restExtractor = restExtractorService def process( version: ApiVersion, @@ -169,7 +169,7 @@ class GroupsApi( } object GroupDisplayInheritedProperties extends LiftApiModuleString { - val schema = API.GroupDisplayInheritedProperties + val schema: API.GroupDisplayInheritedProperties.type = API.GroupDisplayInheritedProperties val restExtractor = restExtractorService def process( version: ApiVersion, @@ -192,7 +192,7 @@ class GroupsApi( } object Delete extends LiftApiModuleString { - val schema = API.DeleteGroup + val schema: API.DeleteGroup.type = API.DeleteGroup val restExtractor = restExtractorService def process( version: ApiVersion, @@ -207,7 +207,7 @@ class GroupsApi( } object Create extends LiftApiModule0 { - val schema = API.CreateGroup + val schema: API.CreateGroup.type = API.CreateGroup val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { if (req.json_?) { @@ -225,7 +225,7 @@ class GroupsApi( } } object Update extends LiftApiModuleString { - val schema = API.UpdateGroup + val schema: API.UpdateGroup.type = API.UpdateGroup val restExtractor = restExtractorService def process( version: ApiVersion, @@ -250,7 +250,7 @@ class GroupsApi( } } object Reload extends LiftApiModuleString { - val schema = API.ReloadGroup + val schema: API.ReloadGroup.type = API.ReloadGroup val restExtractor = restExtractorService def process( version: ApiVersion, @@ -281,7 +281,7 @@ class GroupsApi( // group categories object GetTree extends LiftApiModule0 { - val schema = API.GetGroupTree + val schema: API.GetGroupTree.type = API.GetGroupTree val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = schema.name @@ -294,7 +294,7 @@ class GroupsApi( } } object GetCategory extends LiftApiModuleString { - val schema = API.GetGroupCategoryDetails + val schema: API.GetGroupCategoryDetails.type = API.GetGroupCategoryDetails val restExtractor = restExtractorService def process( version: ApiVersion, @@ -314,7 +314,7 @@ class GroupsApi( } } object DeleteCategory extends LiftApiModuleString { - val schema = API.DeleteGroupCategory + val schema: API.DeleteGroupCategory.type = API.DeleteGroupCategory val restExtractor = restExtractorService def process( version: ApiVersion, @@ -335,7 +335,7 @@ class GroupsApi( } } object UpdateCategory extends LiftApiModuleString { - val schema = API.UpdateGroupCategory + val schema: API.UpdateGroupCategory.type = API.UpdateGroupCategory val restExtractor = restExtractorService def process( version: ApiVersion, @@ -372,7 +372,7 @@ class GroupsApi( } } object CreateCategory extends LiftApiModule0 { - val schema = API.CreateGroupCategory + val schema: API.CreateGroupCategory.type = API.CreateGroupCategory val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = schema.name @@ -410,14 +410,14 @@ class GroupsApi( // object ListV14 extends LiftApiModule0 { - val schema = API.ListGroups + val schema: API.ListGroups.type = API.ListGroups val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV14.listGroups().toLiftResponseList(params, schema) } } object GetV14 extends LiftApiModuleString { - val schema = API.GroupDetails + val schema: API.GroupDetails.type = API.GroupDetails def process( version: ApiVersion, path: ApiPath, @@ -431,7 +431,7 @@ class GroupsApi( } object GroupInheritedPropertiesV14 extends LiftApiModuleString { - val schema = API.GroupInheritedProperties + val schema: API.GroupInheritedProperties.type = API.GroupInheritedProperties def process( version: ApiVersion, path: ApiPath, @@ -450,7 +450,7 @@ class GroupsApi( } object GroupDisplayInheritedPropertiesV14 extends LiftApiModuleString { - val schema = API.GroupDisplayInheritedProperties + val schema: API.GroupDisplayInheritedProperties.type = API.GroupDisplayInheritedProperties def process( version: ApiVersion, path: ApiPath, @@ -469,7 +469,7 @@ class GroupsApi( } object DeleteV14 extends LiftApiModuleString { - val schema = API.DeleteGroup + val schema: API.DeleteGroup.type = API.DeleteGroup def process( version: ApiVersion, path: ApiPath, @@ -487,8 +487,8 @@ class GroupsApi( } object CreateV14 extends LiftApiModule0 { - val schema = API.CreateGroup - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.CreateGroup.type = API.CreateGroup + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { (for { restGroup <- zioJsonExtractor.extractGroup(req).chainError(s"Could not extract group parameters from request").toIO result <- serviceV14.createGroup( @@ -506,7 +506,7 @@ class GroupsApi( } object UpdateV14 extends LiftApiModuleString { - val schema = API.UpdateGroup + val schema: API.UpdateGroup.type = API.UpdateGroup def process( version: ApiVersion, path: ApiPath, @@ -526,7 +526,7 @@ class GroupsApi( } object ReloadV14 extends LiftApiModuleString { - val schema = API.ReloadGroup + val schema: API.ReloadGroup.type = API.ReloadGroup val restExtractor = restExtractorService def process( version: ApiVersion, @@ -542,7 +542,7 @@ class GroupsApi( // group categories object GetTreeV14 extends LiftApiModule0 { - val schema = API.GetGroupTree + val schema: API.GetGroupTree.type = API.GetGroupTree val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = schema.name @@ -555,7 +555,7 @@ class GroupsApi( } } object GetCategoryV14 extends LiftApiModuleString { - val schema = API.GetGroupCategoryDetails + val schema: API.GetGroupCategoryDetails.type = API.GetGroupCategoryDetails val restExtractor = restExtractorService def process( version: ApiVersion, @@ -575,7 +575,7 @@ class GroupsApi( } } object DeleteCategoryV14 extends LiftApiModuleString { - val schema = API.DeleteGroupCategory + val schema: API.DeleteGroupCategory.type = API.DeleteGroupCategory val restExtractor = restExtractorService def process( version: ApiVersion, @@ -596,7 +596,7 @@ class GroupsApi( } } object UpdateCategoryV14 extends LiftApiModuleString { - val schema = API.UpdateGroupCategory + val schema: API.UpdateGroupCategory.type = API.UpdateGroupCategory val restExtractor = restExtractorService def process( version: ApiVersion, @@ -633,7 +633,7 @@ class GroupsApi( } } object CreateCategoryV14 extends LiftApiModule0 { - val schema = API.CreateGroupCategory + val schema: API.CreateGroupCategory.type = API.CreateGroupCategory val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = schema.name diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala index a58933e544a..5494cb0ff12 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala @@ -7,6 +7,7 @@ import com.normation.rudder.apidata.JsonResponseObjects.JRHooks import com.normation.rudder.apidata.implicits._ import com.normation.rudder.hooks.RunHooks import com.normation.rudder.rest.{HookApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.implicits._ @@ -18,7 +19,7 @@ class HookApi( apiVService: HookApiService ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API override def getLiftEndpoints(): List[LiftApiModule] = { @@ -30,7 +31,7 @@ class HookApi( } object GetHooks extends LiftApiModule0 { - val schema = API.GetHooks + val schema: API.GetHooks.type = API.GetHooks def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { apiVService.listHooks().toLiftResponseList(params, schema) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala index 0c267d4a408..00e98b4fd73 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala @@ -56,7 +56,7 @@ class InfoApi( ) extends LiftApiModuleProvider[API] { api => - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints @@ -136,7 +136,7 @@ class InfoApi( } object ApiGeneralInformations extends LiftApiModule0 { - val schema = API.ApiGeneralInformations + val schema: API.ApiGeneralInformations.type = API.ApiGeneralInformations val restExtractor = api.restExtractor def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { val json = list(None) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala index 58d2c054aa7..e157568b318 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala @@ -42,6 +42,7 @@ import com.normation.errors._ import com.normation.rudder.api.ApiVersion import com.normation.rudder.inventory.InventoryFileWatcher import com.normation.rudder.rest.{InventoryApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.RestError @@ -63,7 +64,7 @@ class InventoryApi( incomingInventoryDir: File ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints @@ -80,10 +81,10 @@ class InventoryApi( } object QueueInformation extends LiftApiModule0 { - val tooManyRequestError: RestError = new RestError { + val tooManyRequestError: RestError = new RestError { override def code: Int = 429 // too many requests } - val schema = API.QueueInformation + val schema: API.QueueInformation.type = API.QueueInformation val restExtractor = restExtractorService val actionName = "queueInformation" def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -105,7 +106,7 @@ class InventoryApi( * Signature file mandatory now */ object UploadInventory extends LiftApiModule0 { - val schema = API.UploadInventory + val schema: API.UploadInventory.type = API.UploadInventory val FILE = "file" val SIG = "signature" val sigExtension = ".sign" @@ -154,7 +155,7 @@ class InventoryApi( } object FileWatcherStart extends LiftApiModule0 { - val schema = API.FileWatcherStart + val schema: API.FileWatcherStart.type = API.FileWatcherStart val restExtractor = restExtractorService implicit val actionName: String = "fileWatcherStart" def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -172,7 +173,7 @@ class InventoryApi( } object FileWatcherStop extends LiftApiModule0 { - val schema = API.FileWatcherStop + val schema: API.FileWatcherStop.type = API.FileWatcherStop val restExtractor = restExtractorService implicit val actionName: String = "fileWatcherStop" def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -190,7 +191,7 @@ class InventoryApi( } object FileWatcherRestart extends LiftApiModule0 { - val schema = API.FileWatcherRestart + val schema: API.FileWatcherRestart.type = API.FileWatcherRestart val restExtractor = restExtractorService implicit val actionName: String = "frileWatcherRestart" def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala index 0e6c8eeca91..4bd691e4de3 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala @@ -164,14 +164,14 @@ class LiftHandler( val forceVersion: Option[ApiVersion] // always behave as if that version is passed in header parameter ) extends BuildHandler[Req, Full[LiftResponse], AuthzToken, DefaultParams] { - val logger = LiftApiProcessingLogger + val logger: Log = LiftApiProcessingLogger private[this] var _apis = List.empty[LiftApiModule] - def apis() = _apis - def addModule(module: LiftApiModule): Unit = { + def apis(): List[LiftApiModule] = _apis + def addModule(module: LiftApiModule): Unit = { _apis = _apis :+ module } - def addModules(modules: List[LiftApiModule]): Unit = { + def addModules(modules: List[LiftApiModule]): Unit = { _apis = _apis ::: modules } @@ -299,7 +299,7 @@ trait LiftApiModuleN[R] extends Lif } final case class ChooseApiN[R](old: LiftApiModuleN[R], current: LiftApiModuleN[R]) extends LiftApiModule { - override val schema = old.schema + override val schema: EndpointSchema = old.schema override def process( version: ApiVersion, path: ApiPath, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala index 87ba621baf8..085f6b8101a 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala @@ -85,6 +85,7 @@ import com.normation.rudder.repository.json.DataExtractor.CompleteJson import com.normation.rudder.repository.json.DataExtractor.OptionnalJson import com.normation.rudder.repository.ldap.LDAPEntityMapper import com.normation.rudder.rest.{NodeApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.NotFoundError @@ -173,7 +174,7 @@ class NodeApi( deleteDefaultMode: DeleteMode ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints.map(e => { @@ -209,7 +210,7 @@ class NodeApi( * enabled ones. */ object CreateNodes extends LiftApiModule0 { // - val schema = API.CreateNodes + val schema: API.CreateNodes.type = API.CreateNodes val restExtractor = restExtractorService import ResultHolder._ @@ -409,7 +410,7 @@ class NodeApi( } object ChangePendingNodeStatus extends LiftApiModule0 { - val schema = API.ChangePendingNodeStatus + val schema: API.ChangePendingNodeStatus.type = API.ChangePendingNodeStatus val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val prettify = params.prettify @@ -452,7 +453,7 @@ class NodeApi( } object ListAcceptedNodes extends LiftApiModule0 { - val schema = API.ListAcceptedNodes + val schema: API.ListAcceptedNodes.type = API.ListAcceptedNodes val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val prettify = params.prettify @@ -477,7 +478,7 @@ class NodeApi( } object ListPendingNodes extends LiftApiModule0 { - val schema = API.ListPendingNodes + val schema: API.ListPendingNodes.type = API.ListPendingNodes val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -502,7 +503,7 @@ class NodeApi( } object ApplyPolicyAllNodes extends LiftApiModule0 { - val schema = API.ApplyPolicyAllNodes + val schema: API.ApplyPolicyAllNodes.type = API.ApplyPolicyAllNodes val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val prettify = params.prettify @@ -568,7 +569,7 @@ class NodeApi( } object GetNodesStatus extends LiftApiModule0 { - val schema = API.GetNodesStatus + val schema: API.GetNodesStatus.type = API.GetNodesStatus val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = "getNodeStatus" @@ -597,7 +598,7 @@ class NodeApi( } object GetNodeGlobalScore extends LiftApiModule { - val schema = API.NodeGlobalScore + val schema: API.NodeGlobalScore.type = API.NodeGlobalScore val restExtractor = restExtractorService def process( @@ -619,7 +620,7 @@ class NodeApi( } object GetNodeScoreDetails extends LiftApiModule { - val schema = API.NodeScoreDetails + val schema: API.NodeScoreDetails.type = API.NodeScoreDetails val restExtractor = restExtractorService def process( @@ -637,7 +638,7 @@ class NodeApi( } object GetNodeScoreDetail extends LiftApiModuleString2 { - val schema = API.NodeScoreDetail + val schema: API.NodeScoreDetail.type = API.NodeScoreDetail val restExtractor = restExtractorService def process( @@ -665,7 +666,7 @@ class NodeApi( // No modifications will be performed // read_only user can access this endpoint object NodeDetailsTable extends LiftApiModule0 { - val schema = API.NodeDetailsTable + val schema: API.NodeDetailsTable.type = API.NodeDetailsTable val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val qc: QueryContext = authzToken.qc diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala index 675c62c8284..26846f717b2 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala @@ -54,6 +54,7 @@ import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.repository.RoParameterRepository import com.normation.rudder.repository.WoParameterRepository import com.normation.rudder.rest.{ParameterApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.RestExtractorService @@ -87,7 +88,7 @@ class ParameterApi( serviceV14: ParameterApiService14 ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints @@ -104,7 +105,7 @@ class ParameterApi( } object ListParameters extends LiftApiModule0 { - val schema = API.ListParameters + val schema: API.ListParameters.type = API.ListParameters val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV2.listParameters(req) @@ -112,7 +113,7 @@ class ParameterApi( } object CreateParameter extends LiftApiModule0 { - val schema = API.CreateParameter + val schema: API.CreateParameter.type = API.CreateParameter val restExtractor = restExtractorService implicit val action: String = "createParameter" def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -148,7 +149,7 @@ class ParameterApi( } object ParameterDetails extends LiftApiModuleString { - val schema = API.ParameterDetails + val schema: API.ParameterDetails.type = API.ParameterDetails val restExtractor = restExtractorService def process( version: ApiVersion, @@ -163,7 +164,7 @@ class ParameterApi( } object DeleteParameter extends LiftApiModuleString { - val schema = API.DeleteParameter + val schema: API.DeleteParameter.type = API.DeleteParameter val restExtractor = restExtractorService def process( version: ApiVersion, @@ -178,7 +179,7 @@ class ParameterApi( } object UpdateParameter extends LiftApiModuleString { - val schema = API.UpdateParameter + val schema: API.UpdateParameter.type = API.UpdateParameter val restExtractor = restExtractorService def process( version: ApiVersion, @@ -206,14 +207,14 @@ class ParameterApi( } object ListParametersV14 extends LiftApiModule0 { - val schema = API.ListParameters - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.ListParameters.type = API.ListParameters + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV14.listParameters().toLiftResponseList(params, schema) } } object ParameterDetailsV14 extends LiftApiModuleString { - val schema = API.ParameterDetails + val schema: API.ParameterDetails.type = API.ParameterDetails def process( version: ApiVersion, path: ApiPath, @@ -227,8 +228,8 @@ class ParameterApi( } object CreateParameterV14 extends LiftApiModule0 { - val schema = API.CreateParameter - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.CreateParameter.type = API.CreateParameter + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { (for { restParam <- @@ -241,7 +242,7 @@ class ParameterApi( } object DeleteParameterV14 extends LiftApiModuleString { - val schema = API.DeleteParameter + val schema: API.DeleteParameter.type = API.DeleteParameter def process( version: ApiVersion, path: ApiPath, @@ -255,7 +256,7 @@ class ParameterApi( } object UpdateParameterV14 extends LiftApiModuleString { - val schema = API.UpdateParameter + val schema: API.UpdateParameter.type = API.UpdateParameter def process( version: ApiVersion, path: ApiPath, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala index 835789ddb9a..63f82f61ba7 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala @@ -41,6 +41,7 @@ import com.normation.plugins.PluginSettings import com.normation.plugins.PluginSettingsService import com.normation.rudder.api.ApiVersion import com.normation.rudder.rest.{PluginApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.RestExtractorService @@ -55,7 +56,7 @@ class PluginApi( pluginSettingsService: PluginSettingsService ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints.map(e => { @@ -67,7 +68,7 @@ class PluginApi( } object GetPluginSettings extends LiftApiModule0 { - val schema = API.GetPluginsSettings + val schema: API.GetPluginsSettings.type = API.GetPluginsSettings val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { import com.normation.box._ @@ -97,7 +98,7 @@ class PluginApi( } object UpdatePluginSettings extends LiftApiModule0 { - val schema = API.UpdatePluginsSettings + val schema: API.UpdatePluginsSettings.type = API.UpdatePluginsSettings val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { import com.normation.box._ diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala index 48bd5176ee1..614c6dcf097 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala @@ -133,7 +133,7 @@ class RuleApi( RestUtils.actionResponse2(restExtractorService, dataName, uuidGen, id)(function, req, errorMessage)(action, actor) } - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints.map(e => { @@ -155,7 +155,7 @@ class RuleApi( } object ListRules extends LiftApiModule0 { - val schema = API.ListRules + val schema: API.ListRules.type = API.ListRules val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV2.listRules(req) @@ -163,7 +163,7 @@ class RuleApi( } object CreateRule extends LiftApiModule0 { - val schema = API.CreateRule + val schema: API.CreateRule.type = API.CreateRule val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { var action = "createRule" @@ -185,7 +185,7 @@ class RuleApi( } object RuleDetails extends LiftApiModuleString { - val schema = API.RuleDetails + val schema: API.RuleDetails.type = API.RuleDetails val restExtractor = restExtractorService def process( version: ApiVersion, @@ -200,7 +200,7 @@ class RuleApi( } object DeleteRule extends LiftApiModuleString { - val schema = API.DeleteRule + val schema: API.DeleteRule.type = API.DeleteRule val restExtractor = restExtractorService def process( version: ApiVersion, @@ -215,7 +215,7 @@ class RuleApi( } object UpdateRule extends LiftApiModuleString { - val schema = API.UpdateRule + val schema: API.UpdateRule.type = API.UpdateRule val restExtractor = restExtractorService def process( version: ApiVersion, @@ -241,7 +241,7 @@ class RuleApi( } object GetRuleTree extends LiftApiModule0 { - val schema = API.GetRuleTree + val schema: API.GetRuleTree.type = API.GetRuleTree val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { response( @@ -254,7 +254,7 @@ class RuleApi( } object GetRuleCategoryDetails extends LiftApiModuleString { - val schema = API.GetRuleCategoryDetails + val schema: API.GetRuleCategoryDetails.type = API.GetRuleCategoryDetails val restExtractor = restExtractorService def process( version: ApiVersion, @@ -274,7 +274,7 @@ class RuleApi( } object DeleteRuleCategory extends LiftApiModuleString { - val schema = API.DeleteRuleCategory + val schema: API.DeleteRuleCategory.type = API.DeleteRuleCategory val restExtractor = restExtractorService def process( version: ApiVersion, @@ -296,7 +296,7 @@ class RuleApi( } object UpdateRuleCategory extends LiftApiModuleString { - val schema = API.UpdateRuleCategory + val schema: API.UpdateRuleCategory.type = API.UpdateRuleCategory val restExtractor = restExtractorService def process( version: ApiVersion, @@ -334,7 +334,7 @@ class RuleApi( } object CreateRuleCategory extends LiftApiModule0 { - val schema = API.CreateRuleCategory + val schema: API.CreateRuleCategory.type = API.CreateRuleCategory val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { val restData = if (req.json_?) { @@ -363,15 +363,15 @@ class RuleApi( //////////////////// new API using only zio_json //////////////////// object ListRulesV14 extends LiftApiModule0 { - val schema = API.ListRules - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.ListRules.type = API.ListRules + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val qc: QueryContext = authzToken.qc serviceV14.listRules().toLiftResponseList(params, schema) } } object RuleDetailsV14 extends LiftApiModuleString { - val schema = API.RuleDetails + val schema: API.RuleDetails.type = API.RuleDetails def process( version: ApiVersion, path: ApiPath, @@ -389,7 +389,7 @@ class RuleApi( } object CreateRuleV14 extends LiftApiModule0 { - val schema = API.CreateRule + val schema: API.CreateRule.type = API.CreateRule def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val qc: QueryContext = authzToken.qc @@ -410,7 +410,7 @@ class RuleApi( } object UpdateRuleV14 extends LiftApiModuleString { - val schema = API.UpdateRule + val schema: API.UpdateRule.type = API.UpdateRule def process( version: ApiVersion, path: ApiPath, @@ -431,7 +431,7 @@ class RuleApi( } object DeleteRuleV14 extends LiftApiModuleString { - val schema = API.DeleteRule + val schema: API.DeleteRule.type = API.DeleteRule def process( version: ApiVersion, path: ApiPath, @@ -450,7 +450,7 @@ class RuleApi( } object GetRuleTreeV14 extends LiftApiModule0 { - val schema = API.GetRuleTree + val schema: API.GetRuleTree.type = API.GetRuleTree def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val qc: QueryContext = authzToken.qc @@ -459,7 +459,7 @@ class RuleApi( } object GetRuleCategoryDetailsV14 extends LiftApiModuleString { - val schema = API.GetRuleCategoryDetails + val schema: API.GetRuleCategoryDetails.type = API.GetRuleCategoryDetails def process( version: ApiVersion, path: ApiPath, @@ -473,8 +473,8 @@ class RuleApi( } object CreateRuleCategoryV14 extends LiftApiModule0 { - val schema = API.CreateRuleCategory - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.CreateRuleCategory.type = API.CreateRuleCategory + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { (for { cat <- zioJsonExtractor.extractRuleCategory(req).toIO res <- serviceV14.createCategory(cat, () => uuidGen.newUuid, params, authzToken.qc.actor) @@ -485,7 +485,7 @@ class RuleApi( } object UpdateRuleCategoryV14 extends LiftApiModuleString { - val schema = API.UpdateRuleCategory + val schema: API.UpdateRuleCategory.type = API.UpdateRuleCategory def process( version: ApiVersion, path: ApiPath, @@ -504,7 +504,7 @@ class RuleApi( } object DeleteRuleCategoryV14 extends LiftApiModuleString { - val schema = API.DeleteRuleCategory + val schema: API.DeleteRuleCategory.type = API.DeleteRuleCategory def process( version: ApiVersion, path: ApiPath, @@ -520,7 +520,7 @@ class RuleApi( } object LoadRuleRevisionForGeneration extends LiftApiModuleString { - val schema = API.LoadRuleRevisionForGeneration + val schema: API.LoadRuleRevisionForGeneration.type = API.LoadRuleRevisionForGeneration def process( version: ApiVersion, path: ApiPath, @@ -539,7 +539,7 @@ class RuleApi( } object UnloadRuleRevisionForGeneration extends LiftApiModuleString { - val schema = API.UnloadRuleRevisionForGeneration + val schema: API.UnloadRuleRevisionForGeneration.type = API.UnloadRuleRevisionForGeneration def process( version: ApiVersion, path: ApiPath, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala index 8a8dda44a1a..b3880cc1076 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala @@ -53,6 +53,7 @@ import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.reports._ import com.normation.rudder.rest.{SettingsApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.OneParam @@ -145,7 +146,7 @@ class SettingsApi( val kind = "settings" - def schemas = API + def schemas: ApiModuleProvider[API] = API def getLiftEndpoints(): List[LiftApiModule] = { API.endpoints.map(e => { @@ -163,7 +164,7 @@ class SettingsApi( } object GetAllSettings extends LiftApiModule0 { - val schema = API.GetAllSettings + val schema: API.GetAllSettings.type = API.GetAllSettings val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { val settings = for { @@ -198,7 +199,7 @@ class SettingsApi( } object ModifySettings extends LiftApiModule0 { - val schema = API.ModifySettings + val schema: API.ModifySettings.type = API.ModifySettings val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { var generate = false @@ -710,7 +711,7 @@ class SettingsApi( case object RestChangeRequestUnexpectedUnboundVarValues extends RestChangeUnexpectedReportInterpretation { val startPolicyGeneration = false val key = "unexpected_unbound_var_values" - val prop = UnexpectedReportBehavior.UnboundVarValues + val prop: UnexpectedReportBehavior.UnboundVarValues.type = UnexpectedReportBehavior.UnboundVarValues } def startNewPolicyGeneration(actor: EventActor): Unit = { @@ -867,8 +868,8 @@ class SettingsApi( } } - override val schema = API.GetAllAllowedNetworks - val restExtractor = restExtractorService + override val schema: API.GetAllAllowedNetworks.type = API.GetAllAllowedNetworks + val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { implicit val action = "getAllAllowedNetworks" RestUtils.response(restExtractorService, getRootNameForVersion(version), None)( diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala index 1ee849f68be..ca26ad74dab 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala @@ -55,6 +55,7 @@ import com.normation.rudder.git.GitFindUtils import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.repository.ItemArchiveManager import com.normation.rudder.rest.{SystemApi => API} +import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.EndpointSchema @@ -98,7 +99,7 @@ class SystemApi( rudderBuildTimestamp: String ) extends LiftApiModuleProvider[API] { - def schemas = API + def schemas: ApiModuleProvider[API] = API override def getLiftEndpoints(): List[LiftApiModule] = { @@ -149,7 +150,7 @@ class SystemApi( } object Info extends LiftApiModule0 { - val schema = API.Info + val schema: API.Info.type = API.Info val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -168,7 +169,7 @@ class SystemApi( } object Status extends LiftApiModule0 { - val schema = API.Status + val schema: API.Status.type = API.Status val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -181,7 +182,7 @@ class SystemApi( object DebugInfo extends LiftApiModule0 { - val schema = API.DebugInfo + val schema: API.DebugInfo.type = API.DebugInfo val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -194,7 +195,7 @@ class SystemApi( // Reload [techniques / dynamics groups] endpoint implementation object TechniquesReload extends LiftApiModule0 { - val schema = API.TechniquesReload + val schema: API.TechniquesReload.type = API.TechniquesReload val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -203,7 +204,7 @@ class SystemApi( } object DyngroupsReload extends LiftApiModule0 { - val schema = API.DyngroupsReload + val schema: API.DyngroupsReload.type = API.DyngroupsReload val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -212,7 +213,7 @@ class SystemApi( } object ReloadAll extends LiftApiModule0 { - val schema = API.ReloadAll + val schema: API.ReloadAll.type = API.ReloadAll val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -223,7 +224,7 @@ class SystemApi( // Policies update and regenerate endpoint implementation object PoliciesUpdate extends LiftApiModule0 { - val schema = API.PoliciesUpdate + val schema: API.PoliciesUpdate.type = API.PoliciesUpdate val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -232,7 +233,7 @@ class SystemApi( } object PoliciesRegenerate extends LiftApiModule0 { - val schema = API.PoliciesRegenerate + val schema: API.PoliciesRegenerate.type = API.PoliciesRegenerate val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -243,7 +244,7 @@ class SystemApi( // Archives endpoint implementation object ArchivesGroupsList extends LiftApiModule0 { - val schema = API.ArchivesGroupsList + val schema: API.ArchivesGroupsList.type = API.ArchivesGroupsList val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -252,7 +253,7 @@ class SystemApi( } object ArchivesDirectivesList extends LiftApiModule0 { - val schema = API.ArchivesDirectivesList + val schema: API.ArchivesDirectivesList.type = API.ArchivesDirectivesList val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -261,7 +262,7 @@ class SystemApi( } object ArchivesRulesList extends LiftApiModule0 { - val schema = API.ArchivesRulesList + val schema: API.ArchivesRulesList.type = API.ArchivesRulesList val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -270,7 +271,7 @@ class SystemApi( } object ArchivesParametersList extends LiftApiModule0 { - val schema = API.ArchivesParametersList + val schema: API.ArchivesParametersList.type = API.ArchivesParametersList val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -279,7 +280,7 @@ class SystemApi( } object ArchivesFullList extends LiftApiModule0 { - val schema = API.ArchivesFullList + val schema: API.ArchivesFullList.type = API.ArchivesFullList val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -288,7 +289,7 @@ class SystemApi( } object RestoreGroupsLatestArchive extends LiftApiModule0 { - val schema = API.RestoreGroupsLatestArchive + val schema: API.RestoreGroupsLatestArchive.type = API.RestoreGroupsLatestArchive val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -297,7 +298,7 @@ class SystemApi( } object RestoreDirectivesLatestArchive extends LiftApiModule0 { - val schema = API.RestoreDirectivesLatestArchive + val schema: API.RestoreDirectivesLatestArchive.type = API.RestoreDirectivesLatestArchive val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -306,7 +307,7 @@ class SystemApi( } object RestoreRulesLatestArchive extends LiftApiModule0 { - val schema = API.RestoreRulesLatestArchive + val schema: API.RestoreRulesLatestArchive.type = API.RestoreRulesLatestArchive val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -315,7 +316,7 @@ class SystemApi( } object RestoreParametersLatestArchive extends LiftApiModule0 { - val schema = API.RestoreParametersLatestArchive + val schema: API.RestoreParametersLatestArchive.type = API.RestoreParametersLatestArchive val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -324,7 +325,7 @@ class SystemApi( } object RestoreFullLatestArchive extends LiftApiModule0 { - val schema = API.RestoreFullLatestArchive + val schema: API.RestoreFullLatestArchive.type = API.RestoreFullLatestArchive val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -333,7 +334,7 @@ class SystemApi( } object RestoreGroupsLatestCommit extends LiftApiModule0 { - val schema = API.RestoreGroupsLatestCommit + val schema: API.RestoreGroupsLatestCommit.type = API.RestoreGroupsLatestCommit val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -342,7 +343,7 @@ class SystemApi( } object RestoreDirectivesLatestCommit extends LiftApiModule0 { - val schema = API.RestoreDirectivesLatestCommit + val schema: API.RestoreDirectivesLatestCommit.type = API.RestoreDirectivesLatestCommit val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -351,7 +352,7 @@ class SystemApi( } object RestoreRulesLatestCommit extends LiftApiModule0 { - val schema = API.RestoreRulesLatestCommit + val schema: API.RestoreRulesLatestCommit.type = API.RestoreRulesLatestCommit val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -360,7 +361,7 @@ class SystemApi( } object RestoreParametersLatestCommit extends LiftApiModule0 { - val schema = API.RestoreParametersLatestCommit + val schema: API.RestoreParametersLatestCommit.type = API.RestoreParametersLatestCommit val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -369,7 +370,7 @@ class SystemApi( } object RestoreFullLatestCommit extends LiftApiModule0 { - val schema = API.RestoreFullLatestCommit + val schema: API.RestoreFullLatestCommit.type = API.RestoreFullLatestCommit val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -378,7 +379,7 @@ class SystemApi( } object ArchiveGroups extends LiftApiModule0 { - val schema = API.ArchiveGroups + val schema: API.ArchiveGroups.type = API.ArchiveGroups val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -386,7 +387,7 @@ class SystemApi( } } object ArchiveDirectives extends LiftApiModule0 { - val schema = API.ArchiveDirectives + val schema: API.ArchiveDirectives.type = API.ArchiveDirectives val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -395,7 +396,7 @@ class SystemApi( } object ArchiveRules extends LiftApiModule0 { - val schema = API.ArchiveRules + val schema: API.ArchiveRules.type = API.ArchiveRules val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -404,7 +405,7 @@ class SystemApi( } object ArchiveParameters extends LiftApiModule0 { - val schema = API.ArchiveParameters + val schema: API.ArchiveParameters.type = API.ArchiveParameters val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -413,7 +414,7 @@ class SystemApi( } object ArchiveAll extends LiftApiModule0 { - val schema = API.ArchiveFull + val schema: API.ArchiveFull.type = API.ArchiveFull val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -582,7 +583,7 @@ class SystemApi( } object GetHealthcheckResult extends LiftApiModule0 { - val schema = API.GetHealthcheckResult + val schema: API.GetHealthcheckResult.type = API.GetHealthcheckResult val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -591,7 +592,7 @@ class SystemApi( } object PurgeSoftware extends LiftApiModule0 { - val schema = API.PurgeSoftware + val schema: API.PurgeSoftware.type = API.PurgeSoftware val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala index dd8d223ad4d..ebb500dcead 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala @@ -106,7 +106,7 @@ class TechniqueApi( import TechniqueApi._ import zio.json._ import zio.json.yaml._ - def schemas = API + def schemas: ApiModuleProvider[API] = API val dataName = "techniques" def resp(function: Box[JValue], req: Req, errorMessage: String)(action: String)(implicit dataName: String): LiftResponse = { @@ -279,9 +279,9 @@ class TechniqueApi( } object GetTechniques extends LiftApiModule0 { - val schema = API.GetTechniques - implicit val dataName: String = "techniques" - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.GetTechniques.type = API.GetTechniques + implicit val dataName: String = "techniques" + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV14.getTechniquesWithData().toLiftResponseList(params, schema) } @@ -289,7 +289,7 @@ class TechniqueApi( object GetMethods extends LiftApiModule0 { - val schema = API.GetMethods + val schema: API.GetMethods.type = API.GetMethods val restExtractor = restExtractorService implicit val dataName: String = "methods" @@ -307,7 +307,7 @@ class TechniqueApi( object UpdateMethods extends LiftApiModule0 { - val schema = API.UpdateMethods + val schema: API.UpdateMethods.type = API.UpdateMethods val restExtractor = restExtractorService implicit val dataName: String = "methods" @@ -327,7 +327,7 @@ class TechniqueApi( import techniqueSerializer._ - val schema = API.UpdateTechniques + val schema: API.UpdateTechniques.type = API.UpdateTechniques val restExtractor = restExtractorService implicit val dataName: String = "techniques" @@ -355,7 +355,7 @@ class TechniqueApi( object GetAllTechniqueCategories extends LiftApiModule0 { - val schema = API.GetAllTechniqueCategories + val schema: API.GetAllTechniqueCategories.type = API.GetAllTechniqueCategories val restExtractor = restExtractorService implicit val dataName: String = "techniqueCategories" @@ -415,7 +415,7 @@ class TechniqueApi( techniques.keySet.map(_.name.value.toLowerCase).contains(bundleName.value.toLowerCase) } - val schema = API.CreateTechnique + val schema: API.CreateTechnique.type = API.CreateTechnique val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { val modId = ModificationId(uuidGen.newUuid) // copied from `Req.forcedBodyAsJson` @@ -462,7 +462,7 @@ class TechniqueApi( } object ListTechniques extends LiftApiModule0 { - val schema = API.ListTechniques + val schema: API.ListTechniques.type = API.ListTechniques val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { response( @@ -478,7 +478,7 @@ class TechniqueApi( } object CheckTechnique extends LiftApiModule0 { - val schema = API.CheckTechnique + val schema: API.CheckTechnique.type = API.CheckTechnique val restExtractor = restExtractorService implicit val dataName: String = "techniques" def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { @@ -523,7 +523,7 @@ class TechniqueApi( } object ListTechniquesDirectives extends LiftApiModuleString { - val schema = API.ListTechniquesDirectives + val schema: API.ListTechniquesDirectives.type = API.ListTechniquesDirectives val restExtractor = restExtractorService def process( version: ApiVersion, @@ -547,7 +547,7 @@ class TechniqueApi( } object ListTechniqueDirectives extends LiftApiModuleString2 { - val schema = API.ListTechniqueDirectives + val schema: API.ListTechniqueDirectives.type = API.ListTechniqueDirectives val restExtractor = restExtractorService def process( version: ApiVersion, @@ -580,14 +580,14 @@ class TechniqueApi( } object ListTechniquesV14 extends LiftApiModule0 { - val schema = API.ListTechniques - def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { + val schema: API.ListTechniques.type = API.ListTechniques + def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { serviceV14.listTechniques.toLiftResponseList(params, schema) } } object ListTechniquesDirectivesV14 extends LiftApiModuleString { - val schema = API.ListTechniquesDirectives + val schema: API.ListTechniquesDirectives.type = API.ListTechniquesDirectives def process( version: ApiVersion, path: ApiPath, @@ -602,7 +602,7 @@ class TechniqueApi( } object ListTechniqueDirectivesV14 extends LiftApiModuleString2 { - val schema = API.ListTechniqueDirectives + val schema: API.ListTechniqueDirectives.type = API.ListTechniqueDirectives def process( version: ApiVersion, path: ApiPath, @@ -626,7 +626,7 @@ class TechniqueApi( } object GetTechniqueDetailsAllVersion extends LiftApiModuleString { - val schema = API.GetTechniqueAllVersion + val schema: API.GetTechniqueAllVersion.type = API.GetTechniqueAllVersion def process( version: ApiVersion, path: ApiPath, @@ -641,7 +641,7 @@ class TechniqueApi( } object GetTechnique extends LiftApiModuleString2 { - val schema = API.GetTechnique + val schema: API.GetTechnique.type = API.GetTechnique def process( version: ApiVersion, path: ApiPath, @@ -667,7 +667,7 @@ class TechniqueApi( } object TechniqueRevisions extends LiftApiModuleString2 { - val schema = API.TechniqueRevisions + val schema: API.TechniqueRevisions.type = API.TechniqueRevisions def process( version: ApiVersion, path: ApiPath, diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala index f470b1878ba..3906fd1098f 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala @@ -42,6 +42,7 @@ import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.VariableSpec import com.normation.cfclerk.services.TechniqueRepository import com.normation.cfclerk.services.TechniquesLibraryUpdateNotification +import com.normation.cfclerk.services.TechniquesLibraryUpdateType import com.normation.cfclerk.services.UpdateTechniqueLibrary import com.normation.errors.IOResult import com.normation.eventlog.EventActor @@ -160,6 +161,7 @@ import net.liftweb.http.SHtml import net.liftweb.json.JsonAST.JValue import net.liftweb.mocks.MockHttpServletRequest import net.liftweb.mockweb.MockWeb +import net.liftweb.util.FieldError import net.liftweb.util.NamedPF import org.apache.commons.httpclient.methods.multipart.ByteArrayPartSource import org.apache.commons.httpclient.methods.multipart.FilePart @@ -174,6 +176,7 @@ import scala.collection.MapView import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration import scala.xml.Elem +import scala.xml.NodeSeq import zio._ import zio.syntax._ @@ -193,21 +196,25 @@ import zio.syntax._ */ class RestTestSetUp { - implicit val userService: userService = new userService - class userService extends UserService { + implicit val userService: TestUserService = new TestUserService + class TestUserService extends UserService { val user: AuthenticatedUser = new AuthenticatedUser { - val account = RudderAccount.User("test-user", "pass") + val account: RudderAccount = RudderAccount.User("test-user", "pass") def checkRights(auth: AuthorizationType) = true - def getApiAuthz = ApiAuthz.allAuthz - def nodePerms: NodeSecurityContext = NodeSecurityContext.All + def getApiAuthz: ApiAuthz = ApiAuthz.allAuthz + def nodePerms: NodeSecurityContext = NodeSecurityContext.All } - val getCurrentUser = user + val getCurrentUser: AuthenticatedUser = user } // Instantiate Service needed to feed System API constructor val fakeUpdatePTLibService: UpdateTechniqueLibrary = new UpdateTechniqueLibrary() { - def update(modId: ModificationId, actor: EventActor, reason: Option[String]) = { + def update( + modId: ModificationId, + actor: EventActor, + reason: Option[String] + ): Box[Map[TechniqueName, TechniquesLibraryUpdateType]] = { Full(Map()) } def registerCallback(callback: TechniquesLibraryUpdateNotification): Unit = {} @@ -469,8 +476,8 @@ class RestTestSetUp { // all other apis class FakeClearCacheService extends ClearCacheService { - override def action(actor: EventActor) = null - override def clearNodeConfigurationCache(storeEvent: Boolean, actor: EventActor) = null + override def action(actor: EventActor): Box[String] = null + override def clearNodeConfigurationCache(storeEvent: Boolean, actor: EventActor): Box[Unit] = null } val fakeNotArchivedElements: NotArchivedElements = @@ -584,10 +591,10 @@ class RestTestSetUp { val fakeItemArchiveManager = new FakeItemArchiveManager val fakeClearCacheService = new FakeClearCacheService val fakePersonIndentService: PersonIdentService = new PersonIdentService { - override def getPersonIdentOrDefault(username: String) = ZIO.succeed(fakePersonIdent) + override def getPersonIdentOrDefault(username: String): ZIO[Any, Nothing, PersonIdent] = ZIO.succeed(fakePersonIdent) } val fakeScriptLauncher: DebugInfoService = new DebugInfoService { - override def launch() = DebugInfoScriptResult("test", new Array[Byte](42)).succeed + override def launch(): ZIO[Any, Nothing, DebugInfoScriptResult] = DebugInfoScriptResult("test", new Array[Byte](42)).succeed } val fakeUpdateDynamicGroups: UpdateDynamicGroups = { @@ -670,21 +677,21 @@ class RestTestSetUp { override def default(withId: String): DirectiveField = new DirectiveField { self => type ValueType = String - def manifest = manifestOf[String] - lazy val id = withId - def name = id - override val uniqueFieldId = Full(id) - protected var _x: String = getDefaultValue - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x - def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases + def manifest = manifestOf[String] + lazy val id = withId + def name = id + override val uniqueFieldId: Box[String] = Full(id) + protected var _x: String = getDefaultValue + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x + def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" def get = _x def set(x: String) = { if (null == x) _x = "" else _x = x; _x } - def toForm = Full(SHtml.textarea("", s => parseClient(s))) + def toForm: Box[NodeSeq] = Full(SHtml.textarea("", s => parseClient(s))) } } val directiveEditorService = new DirectiveEditorServiceImpl( diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala index 919cd5bedd2..70d0fed757c 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala @@ -109,13 +109,13 @@ object TraitTestApiFromYamlFiles { implicit val userServiceImp = userService match { case None => new UserService { - val user = new AuthenticatedUser { - val account = RudderAccount.User("test-user", "pass") + val user = new AuthenticatedUser { + val account: RudderAccount = RudderAccount.User("test-user", "pass") def checkRights(auth: AuthorizationType) = true - def getApiAuthz = ApiAuthorization.allAuthz - def nodePerms: NodeSecurityContext = NodeSecurityContext.All + def getApiAuthz: ApiAuthorization = ApiAuthorization.allAuthz + def nodePerms: NodeSecurityContext = NodeSecurityContext.All } - val getCurrentUser = user + val getCurrentUser: AuthenticatedUser = user } case Some(u) => u } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala index ae05fcd2412..55a0baa9846 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala @@ -1607,7 +1607,7 @@ object RudderConfigInit { lazy val tokenGenerator = new TokenGeneratorImpl(32) implicit lazy val userService = new UserService { - def getCurrentUser = CurrentUser + def getCurrentUser: AuthenticatedUser = CurrentUser } lazy val userRepository: UserRepository = new JdbcUserRepository(doobie) @@ -3401,7 +3401,8 @@ object RudderConfigInit { } } - override def default(id: String) = new TextField(id, () => configService.rudder_featureSwitch_directiveScriptEngine().toBox) + override def default(id: String): DirectiveField = + new TextField(id, () => configService.rudder_featureSwitch_directiveScriptEngine().toBox) } lazy val section2FieldService: Section2FieldService = { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PluginStatus.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PluginStatus.scala index 7319cf47d6a..2f146ad7bf1 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PluginStatus.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PluginStatus.scala @@ -87,6 +87,6 @@ trait PluginStatus { * Default "always enable" status */ object AlwaysEnabledPluginStatus extends PluginStatus { - override val current = PluginStatusInfo.EnabledNoLicense + override val current: PluginStatusInfo = PluginStatusInfo.EnabledNoLicense override def isEnabled() = true } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala index 0c5e92988a9..cb732e58b6a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala @@ -48,7 +48,7 @@ import net.liftweb.util.Helpers import scala.xml.NodeSeq trait PluginEnableImpl extends PluginStatus { - override val current = PluginStatusInfo.EnabledNoLicense + override val current: PluginStatusInfo = PluginStatusInfo.EnabledNoLicense override def isEnabled() = true } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala index 80c4c6af5bf..e4856e6f338 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala @@ -70,7 +70,7 @@ class AsyncDeployment extends CometActor with CometListener with Loggable { } } - override def registerWith = asyncDeploymentAgent + override def registerWith: AsyncDeploymentActor = asyncDeploymentAgent override val defaultHtml = NodeSeq.Empty diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala index b83b7db0dcd..0728a1f36bb 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala @@ -471,7 +471,7 @@ class DirectiveEditForm( override def subContainerClassName = "col-sm-12" override def setFilter = notNull _ :: trim _ :: Nil override val maxLen = 255 - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } } @@ -512,7 +512,7 @@ class DirectiveEditForm( priorities, defaultValue = directive.priority ) { - val tooltipContent = { + val tooltipContent = { s""" |
|

Priority

@@ -525,7 +525,7 @@ class DirectiveEditForm( |
|""".stripMargin } - override val displayHtml = { + override val displayHtml: NodeSeq = {
Priority diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala index 5eb2184c22b..05836478b47 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala @@ -55,6 +55,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -248,8 +249,8 @@ class NodeGroupCategoryForm( override def className = "form-control" override def labelClassName = "" override def subContainerClassName = "" - override def validations = Nil - override def errorClassName = "field_errors paddscala" + override def validations: List[String => List[FieldError]] = Nil + override def errorClassName = "field_errors paddscala" } /** diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala index 779b45a7596..6eb38b6cb99 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala @@ -230,7 +230,7 @@ class RuleCategoryTree( override val attrs = ("data-jstree" -> """{ "type" : "category" }""") :: ("id", category.id.value) :: Nil - override def body = { + override def body: NodeSeq = { val applyCheckBox = { directive match { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala index 6906002cc4e..d90fcbe0e2d 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala @@ -49,6 +49,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -147,7 +148,7 @@ class TechniqueCategoryEditForm( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("style" -> "height:10em") - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil override def toForm_! = ( "field-label" #> displayHtml diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala index 469131f20af..9b7ce8c085b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala @@ -100,10 +100,10 @@ class TechniqueTree( val msg = "Can not build tree of dependencies for Technique %s".format(techniqueId) logger.error(msg, e) (new JsTreeNode { - override def body = Can not find dependencies. { + override def body: NodeSeq = Can not find dependencies. { (e ?~! msg).messageChain } - override def children = Nil + override def children: List[JsTreeNode] = Nil }).toXml } } @@ -115,9 +115,9 @@ class TechniqueTree( technique: Technique, activeTechnique: ActiveTechnique ): JsTreeNode = new JsTreeNode { - override val attrs = ("data-jstree" -> """{ "type" : "category" }""") :: Nil - val tooltipContent = s"

${category.name}

\n
${category.description}
" - override def body = { + override val attrs = ("data-jstree" -> """{ "type" : "category" }""") :: Nil + val tooltipContent = s"

${category.name}

\n
${category.description}
" + override def body: NodeSeq = { { category.name } @@ -133,8 +133,8 @@ class TechniqueTree( technique: Technique, activeTechnique: ActiveTechnique ): JsTreeNode = new JsTreeNode { - val tooltipContent = s"

${technique.name}

\n
${technique.description}
" - override def body = { + val tooltipContent = s"

${technique.name}

\n
${technique.description}
" + override def body: NodeSeq = { {technique.name} } override def children = dep.directives.keySet.toList.map(directiveId => directiveNode(dep, directiveId)) @@ -150,7 +150,7 @@ class TechniqueTree( override val attrs = ("data-jstree" -> """{ "type" : "directive" }""") :: Nil ::: (if (!directive.isEnabled) ("class" -> "disableTreeNode") :: Nil else Nil) - override def body = { + override def body: NodeSeq = { val tooltipContent = s"

${directive.name}

\n
${directive.shortDescription}
" {directive.name} } @@ -162,27 +162,27 @@ class TechniqueTree( ruleRepository.get(id).toBox match { case Full(rule) => new JsTreeNode { - override val attrs = { + override val attrs = { ("data-jstree" -> """{ "type" : "rule" }""") :: Nil ::: (if (!rule.isEnabled) ("class" -> "disableTreeNode") :: Nil else Nil) } - override def body = { + override def body: NodeSeq = { val tooltipContent = s"

${rule.name}

\n
${rule.shortDescription}
" { rule.name } } - override def children = Nil + override def children: List[JsTreeNode] = Nil } case e: EmptyBox => val msg = "Can not build tree of dependencies for Technique %s".format(techniqueId) logger.error(msg, e) new JsTreeNode { - override def body = Can not find Rule details for id {id}. { + override def body: NodeSeq = Can not find Rule details for id {id}. { (e ?~! msg) } - override def children = Nil + override def children: List[JsTreeNode] = Nil } } } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala index f8442a31c0b..de5da0448ac 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala @@ -54,6 +54,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -107,7 +108,7 @@ class CreateActiveTechniqueCategoryPopup( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("class" -> "form-control col-xl-12 col-md-12 col-sm-12") % ("tabindex" -> "2") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala index c47a7591954..423ca0b3485 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala @@ -58,6 +58,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -162,7 +163,7 @@ class CreateCategoryOrGroupPopup( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("style" -> "height:5em") % ("tabindex" -> "4") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala index c31f2fff7fd..39b7f0531ff 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala @@ -54,6 +54,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -163,7 +164,7 @@ class CreateCloneDirectivePopup( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("style" -> "height:7em") % ("tabindex" -> "2") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala index 4d0dc40a21b..a9aea24e155 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala @@ -21,6 +21,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -243,7 +244,7 @@ class CreateCloneGroupPopup( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("style" -> "height:5em") % ("tabindex" -> "3") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } private[this] val isStatic = { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala index 056aa8e5377..88a032c32db 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala @@ -64,6 +64,7 @@ import net.liftweb.http.DispatchSnippet import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -260,7 +261,7 @@ class CreateOrUpdateGlobalParameterPopup( case _ => super.inputField }) % ("style" -> "height:4em") % ("tabindex" -> "2") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } } @@ -272,7 +273,7 @@ class CreateOrUpdateGlobalParameterPopup( case _ => super.inputField }) % ("tabindex" -> "3") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } } @@ -285,8 +286,8 @@ class CreateOrUpdateGlobalParameterPopup( case _ => super.inputField }) % ("tabindex" -> "4")) override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil - override val helpAsHtml = Full( + override def validations: List[String => List[FieldError]] = Nil + override val helpAsHtml: Box[NodeSeq] = Full(
Define inheritance behavior for the value with 3 chars: first for json object (m=merge, o=override), 2nd for array and 3rd for string (o=override, a=append, p=prepend). Default to 'moo'.
) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala index a5931385a52..bd53bd138c2 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala @@ -59,6 +59,7 @@ import net.liftweb.http.Templates import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -170,7 +171,7 @@ class CreateOrCloneRulePopup( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("style" -> "height:7em") % ("tabindex" -> "2") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala index 7657759e9e1..dbf4d67871e 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala @@ -67,6 +67,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -404,7 +405,7 @@ class ModificationValidationPopup( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("style" -> "height:7em") % ("tabindex" -> "2") % ("class" -> "nodisplay") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala index 0cd4bacf9f9..888063a4529 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala @@ -54,6 +54,7 @@ import net.liftweb.http.SHtml import net.liftweb.http.js._ import net.liftweb.http.js.JE._ import net.liftweb.http.js.JsCmds._ +import net.liftweb.util.FieldError import net.liftweb.util.Helpers._ import scala.xml._ @@ -164,7 +165,7 @@ class RuleCategoryPopup( override def setFilter = notNull _ :: trim _ :: Nil override def inputField = super.inputField % ("tabindex" -> "4") override def errorClassName = "col-xl-12 errors-container" - override def validations = Nil + override def validations: List[String => List[FieldError]] = Nil } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala index 5b8c6fc3e4e..b97b70699ff 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala @@ -121,12 +121,12 @@ class TextField( def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def name = id + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" @@ -148,12 +148,12 @@ class ReadOnlyTextField(val id: String) extends DirectiveField { def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def name = id + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" @@ -250,10 +250,10 @@ class SelectField(val id: String, items: Seq[ValueLabel]) extends DirectiveField def manifest: Manifest[ValueType] = manifestOf[ValueType] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil + def name = id + def validate: List[FieldError] = Nil + def validations: List[Seq[String] => List[FieldError]] = Nil + def setFilter: List[Seq[String] => Seq[String]] = Nil def parseClient(s: String): Unit = { if (null == s) values = getDefaultValue @@ -305,12 +305,12 @@ class SelectOneField(val id: String, valueslabels: Seq[ValueLabel]) extends Dire def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def name = id + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x override def displayHtml: Text = { Text({ valueslabels.filter(entry => (entry.value == _x)).headOption.map(entry => entry.label).getOrElse("") }) @@ -353,20 +353,20 @@ class UploadedFileField(basePath: String)(val id: String) extends DirectiveField def manifest: Manifest[File] = manifestOf[File] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = { + def name = id + def validate: List[FieldError] = Nil + def validations: List[File => List[FieldError]] = Nil + def setFilter: List[File => File] = Nil + def parseClient(s: String): Unit = { if (isEmpty(s)) set(null) else set(new File(root, s)) } - def toClient: String = if (null == f) "" else f.getName + def toClient: String = if (null == f) "" else f.getName def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = { Some(filters.foldLeft(listFiles.map(_._1).toSet)((files, filter) => files.filter(f => filter(f)))) } - def getDefaultValue = null + def getDefaultValue: File = null private def listFiles: Seq[(File, String)] = { if (!root.exists || !root.isDirectory) Seq() @@ -385,11 +385,11 @@ class DateField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = { + def name = id + def validate: List[FieldError] = Nil + def validations: List[LocalDate => List[FieldError]] = Nil + def setFilter: List[LocalDate => LocalDate] = Nil + def parseClient(s: String): Unit = { try { _x = format.parseDateTime(s).toLocalDate } catch { @@ -398,7 +398,7 @@ class DateField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel errors = errors ::: List(FieldError(this, "Bad date format")) } } - def toClient: String = if (null == _x) "" else _x.toString(format) + def toClient: String = if (null == _x) "" else _x.toString(format) def toForm: Full[NodeSeq] = { val xml = (SHtml.text(toClient, x => parseClient(x)) % ("id" -> this.id)) ++ @@ -434,11 +434,11 @@ class TimeField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = { + def name = id + def validate: List[FieldError] = Nil + def validations: List[LocalTime => List[FieldError]] = Nil + def setFilter: List[LocalTime => LocalTime] = Nil + def parseClient(s: String): Unit = { try { _x = format.parseDateTime(s).toLocalTime } catch { @@ -447,7 +447,7 @@ class TimeField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel errors = errors ::: List(FieldError(this, "Bad time format")) } } - def toClient: String = if (null == _x) "" else _x.toString(format) + def toClient: String = if (null == _x) "" else _x.toString(format) def toForm: Full[NodeSeq] = { val xml = (SHtml.text(toClient, x => parseClient(x)) % ("id" -> this.id)) ++ @@ -485,12 +485,12 @@ class PeriodField(showSeconds: Boolean = true, showMinutes: Boolean = true, show override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil + def name = id + def validate: List[FieldError] = Nil + def validations: List[Period => List[FieldError]] = Nil + def setFilter: List[Period => Period] = Nil // awaiting string: a duration in milliseconds - def parseClient(s: String): Unit = { + def parseClient(s: String): Unit = { try { _x = new Period(s.toLong) } catch { @@ -502,7 +502,7 @@ class PeriodField(showSeconds: Boolean = true, showMinutes: Boolean = true, show errors = errors ::: List(FieldError(this, "Bad time format")) } } - def toClient: String = if (null == _x) "0" else _x.getMillis.toString + def toClient: String = if (null == _x) "0" else _x.getMillis.toString def toForm: Full[Elem] = { def intOpts(until: Int, by: Int = 1): Seq[(Int, String)] = @@ -554,14 +554,14 @@ class FilePermsField(val id: String) extends DirectiveField { def manifest: Manifest[FilePerms] = manifestOf[FilePerms] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = { + def name = id + def validate: List[FieldError] = Nil + def validations: List[FilePerms => List[FieldError]] = Nil + def setFilter: List[FilePerms => FilePerms] = Nil + def parseClient(s: String): Unit = { if (!isEmpty(s)) FilePerms(s).map(_x.set(_)) } - def toClient: String = if (null == _x) "" else _x.octal + def toClient: String = if (null == _x) "" else _x.octal def toForm: Full[NodeSeq] = { val xml = @@ -605,12 +605,12 @@ class CheckboxField(val id: String) extends DirectiveField { def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = if (null == s) _x = "false" else _x = s - def toClient: String = if (null == _x) "false" else _x + def name = id + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "false" else _x = s + def toClient: String = if (null == _x) "false" else _x override def displayHtml: Text = { if ((null == _x) || ("false" == _x)) Text("No") else Text("Yes") } def toForm: Full[NodeSeq] = Full(SHtml.checkbox(toClient.equalsIgnoreCase("true"), x => parseClient(x.toString))) @@ -640,11 +640,11 @@ class PasswordField( def getDefaultValue = "" def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - private var errors: List[FieldError] = Nil + def name = id + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + private var errors: List[FieldError] = Nil override def usedFields_=(fields: Seq[DirectiveField]): Unit = { _usedFields = fields @@ -894,10 +894,10 @@ class DerivedPasswordField(val id: String, val derivedType: HashAlgoConstraint.D def getDefaultValue = "" def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil + def name = id + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil // the actual backend value like: sha1:XXXXXX private[this] var _x: String = getDefaultValue @@ -984,12 +984,12 @@ class FileField( def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) - def name = id - def validate = Nil - def validations = Nil - def setFilter = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def name = id + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala index 5bdce896eb9..8e60bf09b8f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala @@ -70,7 +70,7 @@ trait JsTreeNode { * An empty JsTreeNode - display nothing */ object EmptyJsTreeNode extends JsTreeNode { - override val body = NodeSeq.Empty - override val children = Nil - override val toXml = NodeSeq.Empty + override val body = NodeSeq.Empty + override val children: List[JsTreeNode] = Nil + override val toXml = NodeSeq.Empty } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala index 4b84c4e3499..71124118b63 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala @@ -61,7 +61,7 @@ class FormTracker(private[this] var _fields: List[RudderBaseField] = Nil) extend private[this] var _formErrors = List.empty[FormError] - override def allFields = _fields.toList + override def allFields: List[RudderBaseField] = _fields.toList def register(field: RudderBaseField): Unit = _fields ::= field diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala index 510ed984051..1a116a00818 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala @@ -306,7 +306,7 @@ object DisplayDirectiveTree extends Loggable { val agentTypes = technique.toList.flatMap(_.agentConfigs.map(_.agentType)) val agentCompat = AgentCompat(agentTypes) - override def children = Nil + override def children: List[JsTreeNode] = Nil val classes = { val includedClass = if (included.contains(directive.id.uid)) { "included" } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala index 493dd855059..da0711b3318 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala @@ -132,7 +132,7 @@ object DisplayNodeGroupTree extends Loggable { val htmlId = s"jstree-${targetInfo.target.target.target}" - override def children = Nil + override def children: List[JsTreeNode] = Nil val classes = { val includedClass = if (included.contains(targetInfo.target.target)) { "included" } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala index 0830504e1ff..12c6a0112c7 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala @@ -633,7 +633,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { val agentTypes = technique.agentConfigs.map(_.agentType).toSet val agentCompat = AgentCompat(agentTypes) - override def body = { + override def body: NodeSeq = { val tooltipContent = s"""

${technique.name}

@@ -649,8 +649,8 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { }>{agentCompat.icon}{technique.name} ) } - override def children = Nil - override val attrs = { + override def children: List[JsTreeNode] = Nil + override val attrs = { ("data-jstree" -> """{ "type" : "template" }""") :: ("id" -> ("ref-technique-" + technique.id.name.value)) :: ("activeTechniqueId" -> technique.id.name.value) :: @@ -660,7 +660,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { new JsTreeNode { // actually transform a technique category to jsTree nodes: - override def body = { + override def body: NodeSeq = { val tooltipContent = s"

${category.name}${category.description}" { @@ -716,7 +716,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { optTechnique match { case Some(technique) => new JsTreeNode { - override def body = { + override def body: NodeSeq = { val tooltipContent = s"""

${technique.name}

${technique.escapedDescription}

${agentCompat.techniqueText} @@ -739,8 +739,8 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { ) ) } - override def children = Nil - override val attrs = { + override def children: List[JsTreeNode] = Nil + override val attrs = { ("data-jstree" -> """{ "type" : "template" }""") :: ("activeTechniqueId" -> technique.id.name.value) :: Nil ::: @@ -769,7 +769,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { } new JsTreeNode { - override def body = { + override def body: NodeSeq = { val tooltipContent = s"

Missing technique ${activeTechnique.techniqueName.value}

\n
The technique is missing on the repository. Active technique based on it are disable until the technique is putted back on the repository
" SHtml.a( @@ -779,8 +779,8 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { } ) } - override def children = Nil - override val attrs = { + override def children: List[JsTreeNode] = Nil + override val attrs = { ("data-jstree" -> """{ "type" : "template" }""") :: ("activeTechniqueId" -> activeTechnique.techniqueName.value) :: Nil ::: @@ -814,7 +814,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { ("catId" -> category.id.value) :: Nil } - override def body = { + override def body: NodeSeq = { val tooltipContent = s"

${category.name}

\n
${category.description}
" SHtml.a( onClickUserCategory _, diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala index 4c54271bc59..b14fd64d0a2 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala @@ -199,7 +199,7 @@ object ConfigSection2FieldService { } } - override def default(id: String) = new TextField(id, () => Full(Disabled)) + override def default(id: String): DirectiveField = new TextField(id, () => Full(Disabled)) } def section2FieldService: Section2FieldService = { From 25a103c80b6a98e377763f92e8e78359d412557b Mon Sep 17 00:00:00 2001 From: Matthieu Baechler Date: Thu, 18 Jan 2024 10:23:02 +0100 Subject: [PATCH 2/6] Finally enable -Xsource:3 scalac option to prevent regression in scala 3 migration --- webapp/sources/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webapp/sources/pom.xml b/webapp/sources/pom.xml index 12e5398ee0f..e6abbb685e1 100644 --- a/webapp/sources/pom.xml +++ b/webapp/sources/pom.xml @@ -184,6 +184,7 @@ limitations under the License. -Xlint:_,-nullary-unit,-missing-interpolator -Yno-adapted-args -Ywarn-dead-code -Ywarn-extra-implicit -Ywarn-inaccessible -Ywarn-infer-any -Ywarn-nullary-override -Ywarn-numeric-widen -Ywarn-unused:imports -Ywarn-unused:locals -Ywarn-unused:privates --> + -Xsource:3 -deprecation -explaintypes -feature @@ -212,6 +213,9 @@ limitations under the License. -Wconf:cat=unused-nowarn&src=com/normation/utils/Version.scala:s,cat=unused-nowarn&src=com/normation/rudder/services/policies/InterpolatedValueCompiler.scala:s + + + -Wconf:msg=constructor modifiers are assumed by synthetic:s -Xmx${jvmArg-Xmx} From 92b3a4057fad7829a2cf89d75da0dfdc871b281c Mon Sep 17 00:00:00 2001 From: Matthieu Baechler Date: Thu, 18 Jan 2024 10:26:21 +0100 Subject: [PATCH 3/6] Upgrade scalafmt to latest version --- webapp/sources/.scalafmt.conf | 2 +- .../inventory/domain/AgentTypes.scala | 8 +- .../inventory/domain/Identifiers.scala | 2 +- .../inventory/domain/MachineInventory.scala | 4 +- .../inventory/domain/NodeInventory.scala | 26 ++--- .../provisioning/fusion/TestPreParsing.scala | 2 +- .../fusion/TestReportParsing.scala | 2 +- webapp/sources/pom.xml | 1 + .../cfclerk/domain/AixPasswordHashAlgo.scala | 2 +- .../normation/cfclerk/domain/Constraint.scala | 2 +- .../cfclerk/domain/HashAlgoConstraint.scala | 4 +- .../cfclerk/domain/VariableAndSection.scala | 2 +- .../domain/VariableAndSectionSpec.scala | 20 ++-- .../cfclerk/services/TechniqueReader.scala | 2 +- .../services/impl/GitTechniqueReader.scala | 2 +- .../impl/TechniqueRepositoryImpl.scala | 4 +- .../cfclerk/xmlparsers/TechniqueParser.scala | 2 +- .../com/normation/eventlog/EventLog.scala | 2 +- .../rudder/apidata/JsonQueryObjects.scala | 4 +- .../rudder/apidata/JsonResponseObjects.scala | 6 +- .../rudder/apidata/RestDataSerializer.scala | 38 +++---- .../rudder/batch/AbstractScheduler.scala | 8 +- .../campaigns/CampaignEventRepository.scala | 12 +- .../campaigns/JsonCampaignSerializer.scala | 6 +- .../normation/rudder/domain/RudderDit.scala | 10 +- .../rudder/domain/RudderLDAPConstants.scala | 2 +- .../eventlog/ChangeRequestEventLog.scala | 2 +- .../rudder/domain/eventlog/NodeEventLog.scala | 8 +- .../domain/eventlog/TechniqueEventLog.scala | 6 +- .../rudder/domain/policies/RuleTarget.scala | 4 +- .../rudder/domain/policies/SimpleDiff.scala | 10 +- .../rudder/domain/policies/Tags.scala | 2 +- .../rudder/domain/properties/Properties.scala | 22 ++-- .../rudder/domain/queries/CmdbQuery.scala | 30 ++--- .../queries/NodeQueryCriteriaData.scala | 34 +++--- .../domain/reports/CleanReportsAction.scala | 8 +- .../domain/reports/ComplianceLevel.scala | 4 +- .../domain/reports/ExpectedReports.scala | 2 +- .../rudder/facts/nodes/NodeFact.scala | 16 +-- .../facts/nodes/NodeFactRepository.scala | 34 +++--- .../rudder/facts/nodes/NodeFactStorage.scala | 8 +- .../normation/rudder/hooks/RunNuCommand.scala | 4 +- .../inventory/InventoryFileWatcher.scala | 2 +- .../rudder/ncf/EditorTechnique.scala | 8 +- .../rudder/ncf/TechniqueCompiler.scala | 6 +- .../jdbc/ReportsJdbcRepository.scala | 6 +- .../repository/json/JsonExctractorUtils.scala | 6 +- .../repository/ldap/LDAPEntityMapper.scala | 4 +- .../rudder/repository/xml/GitArchivers.scala | 8 +- .../xml/ItemArchiveManagerImpl.scala | 4 +- .../services/nodes/RemoveNodeService.scala | 50 ++++----- .../impl/FileHistoryLogRepository.scala | 2 +- .../impl/InventoryHistoryLogRepository.scala | 2 +- .../services/policies/DataStructures.scala | 8 +- .../services/policies/DeploymentService.scala | 2 +- .../policies/InterpolatedValueCompiler.scala | 20 ++-- .../services/policies/JavascriptEngine.scala | 32 +++--- .../policies/write/AgentSpecificLogic.scala | 2 +- .../policies/write/BuildBundleSequence.scala | 2 +- .../policies/write/PolicyWriterService.scala | 12 +- .../services/queries/CmdbQueryParser.scala | 4 +- .../queries/NodeFactQueryProcessor.scala | 6 +- .../quicksearch/QuickSearchBackendImpl.scala | 16 +-- .../quicksearch/QuickSearchDomain.scala | 2 +- .../quicksearch/QuickSearchQueryParser.scala | 6 +- .../quicksearch/QuickSearchService.scala | 12 +- .../services/reports/ExecutionBatch.scala | 10 +- .../services/reports/ReportingService.scala | 10 +- .../reports/ReportingServiceImpl.scala | 26 ++--- .../PolicyServerManagementService.scala | 2 +- .../CommitAndDeployChangeRequestService.scala | 28 ++--- .../cfclerk/domain/SectionTest.scala | 2 +- .../services/DummyTechniqueRepository.scala | 14 +-- .../cfclerk/services/JGitRepositoryTest.scala | 4 +- .../services/TechniqueRepositoryTest.scala | 30 ++--- .../cfclerk/xmlparsers/TestXmlUtils.scala | 2 +- .../com/normation/rudder/MockServices.scala | 10 +- .../facts/nodes/TestSaveInventory.scala | 8 +- .../migration/TestManageMigration.scala | 2 +- .../ncf/TestEditorTechniqueWriter.scala | 28 ++--- .../TestEditorTechniqueWriterFallback.scala | 6 +- .../jdbc/GitModificationRepositoryTest.scala | 2 +- .../jdbc/ReportingServiceTest.scala | 62 +++++------ .../rudder/repository/jdbc/ReportsTest.scala | 4 +- .../impl/TestFileHistoryLogRepository.scala | 4 +- .../services/policies/NodeConfigData.scala | 28 ++--- .../TestNodeAndGlobalParameterLookup.scala | 2 +- .../policies/write/PolicyAgregationTest.scala | 4 +- .../queries/TestNodeFactQueryProcessor.scala | 4 +- .../queries/TestPendingNodePolicies.scala | 12 +- .../CachedFindRuleNodeStatusReportsTest.scala | 54 ++++----- .../services/reports/ExecutionBatchTest.scala | 6 +- .../reports/ReportingServiceUtilsTest.scala | 4 +- .../normation/appconfig/ConfigService.scala | 104 +++++++++--------- .../com/normation/rudder/Authorizations.scala | 10 +- .../rudder/rest/ApiDatastructures.scala | 4 +- .../rudder/rest/RestExtractorService.scala | 12 +- .../com/normation/rudder/rest/RestUtils.scala | 38 +++---- .../rudder/rest/RudderJsonResponse.scala | 32 +++--- .../rudder/rest/data/CreateNodeData.scala | 2 +- .../rudder/rest/internal/SharedFilesAPI.scala | 2 +- .../rudder/rest/lift/ArchiveApi.scala | 6 +- .../rudder/rest/lift/ComplianceApi.scala | 28 ++--- .../rudder/rest/lift/DirectiveApi.scala | 20 ++-- .../rudder/rest/lift/GroupsApi.scala | 36 +++--- .../rudder/rest/lift/LiftApiDispatcher.scala | 12 +- .../normation/rudder/rest/lift/NodeApi.scala | 26 ++--- .../rudder/rest/lift/ParametersApi.scala | 16 +-- .../normation/rudder/rest/lift/RuleApi.scala | 48 ++++---- .../rudder/rest/lift/SettingsApi.scala | 100 ++++++++--------- .../rudder/rest/lift/SystemApi.scala | 2 +- .../rudder/rest/lift/TechniqueApi.scala | 2 +- .../com/normation/rudder/users/User.scala | 2 +- .../rudder/web/model/DirectiveEditor.scala | 2 +- .../rudder/web/model/FilePermissions.scala | 14 +-- .../web/services/ComputePolicyMode.scala | 8 +- .../services/EventLogDetailsGenerator.scala | 4 +- .../com/normation/rudder/MockServices.scala | 96 ++++++++-------- .../normation/rudder/rest/RestTestSetUp.scala | 99 +++++++++-------- .../rest/TraitTestApiFromYamlFiles.scala | 8 +- .../normation/templates/cli/TemplateCli.scala | 4 +- .../bootstrap/liftweb/AppConfigAuth.scala | 8 +- .../main/scala/bootstrap/liftweb/Boot.scala | 2 +- .../bootstrap/liftweb/RudderConfig.scala | 2 +- .../liftweb/RudderUserDetailsFile.scala | 2 +- ...MigrateChangeValidationEnforceSchema.scala | 2 +- .../components/ComplianceModeEditForm.scala | 4 +- .../web/components/SearchNodeComponent.scala | 6 +- .../components/ShowNodeDetailsFromNode.scala | 4 +- .../web/model/DirectiveFieldEditors.scala | 90 +++++++-------- .../rudder/web/model/RudderBaseField.scala | 20 ++-- .../web/services/AsyncComplianceService.scala | 18 +-- .../web/services/DisplayDirectiveTree.scala | 4 +- .../rudder/web/services/DisplayNode.scala | 22 ++-- .../rudder/web/services/NodeGrid.scala | 6 +- .../rudder/web/snippet/RegisterToasts.scala | 2 +- .../configuration/ParameterManagement.scala | 2 +- .../TestMigrateJsonTechniquesToYaml.scala | 4 +- ...estMigrateNodeAcceptationInventories.scala | 22 ++-- .../normation/ldap/ldif/LDIFFileLogger.scala | 12 +- .../normation/ldap/sdk/LDAPConnection.scala | 4 +- .../ldap/sdk/LDAPConnectionProvider.scala | 8 +- .../com/normation/ldap/sdk/LDAPEntry.scala | 22 ++-- .../com/normation/ldap/sdk/LDAPTreeTest.scala | 3 +- .../main/scala/com/normation/ZioCommons.scala | 14 +-- .../com/normation/utils/CronParser.scala | 2 +- .../utils/StandardFieldsValidation.scala | 2 +- .../scala/com/normation/utils/Version.scala | 28 ++--- .../scala/com/normation/ZioCommonsTest.scala | 2 +- .../com/normation/utils/TestControl.scala | 4 +- 150 files changed, 1008 insertions(+), 1009 deletions(-) diff --git a/webapp/sources/.scalafmt.conf b/webapp/sources/.scalafmt.conf index afa66cd3914..26fdc2be3da 100644 --- a/webapp/sources/.scalafmt.conf +++ b/webapp/sources/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.5.9" +version = "3.7.17" maxColumn = 130 runner.debug = true runner.dialect = scala213 diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala index bb6bbde0d7a..f0e2c81205f 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala +++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala @@ -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) } diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/Identifiers.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/Identifiers.scala index 6ecf993d6f9..872b0d987fd 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/Identifiers.scala +++ b/webapp/sources/ldap-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala index ad5431cad1c..c1dfc8541ff 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala +++ b/webapp/sources/ldap-inventory/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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala index 4859464cd7b..2db510399ca 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala +++ b/webapp/sources/ldap-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/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala index 130c426a962..84d18f0a8d4 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala @@ -73,7 +73,7 @@ class TestPreParsing extends Specification { } url.openStream() } - }(is => effectUioUnit(is.close)) { is => fromXml("check", is).flatMap[Any, RudderError, NodeSeq](pre.apply) }).either.runNow + }(is => effectUioUnit(is.close))(is => fromXml("check", is).flatMap[Any, RudderError, NodeSeq](pre.apply))).either.runNow } } val post = new PreInventoryParserCheckConsistency diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala index fca8e288dba..ddadf05e320 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala @@ -77,7 +77,7 @@ class TestInventoryParsing extends Specification with Loggable { } val parser = new FusionInventoryParser(new StringUuidGeneratorImpl) - def parseRun(inventory: String): Inventory = ZioRuntime.unsafeRun(parser.parse(inventory)) + def parseRun(inventory: String): Inventory = ZioRuntime.unsafeRun(parser.parse(inventory)) def parseRunEither(inventory: String): Either[RudderError, Inventory] = ZioRuntime.unsafeRun(parser.parse(inventory).either) // we are testing some error etc, so make the standard output cleaner: diff --git a/webapp/sources/pom.xml b/webapp/sources/pom.xml index e6abbb685e1..2ab9987b48b 100644 --- a/webapp/sources/pom.xml +++ b/webapp/sources/pom.xml @@ -293,6 +293,7 @@ limitations under the License. + 3.7.17 .scalafmt.conf diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala index c32ed59db16..6fbbb35842e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala @@ -246,7 +246,7 @@ object AixPasswordHashAlgo extends Loggable { final protected[domain] def doSsha( sha: ShaSpec, skf: SecretKeyFactory - )(pwd: String, salt: Option[String], cost: Int): String = { + )(pwd: String, salt: Option[String], cost: Int): String = { val rounds = 2 << (cost - 1) val s = salt.getOrElse(getRandomSalt(16)).getBytes("UTF-8") val spec: PBEKeySpec = new PBEKeySpec(pwd.toCharArray, s, rounds, 8 * sha.byteNumber) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala index f8876bbfc1f..e39b0d106c2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala @@ -251,7 +251,7 @@ final case class MasterPasswordVType(authorizedHash: Seq[HashAlgoConstraint]) ex } sealed trait DerivedPasswordVType extends AbstactPassword { - def tpe: HashAlgoConstraint.DerivedPasswordType + def tpe: HashAlgoConstraint.DerivedPasswordType override lazy val name: String = s"derivedPassword:${tpe.name}" } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala index 20b8b774f32..f8f054c6a51 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala @@ -54,8 +54,8 @@ sealed trait HashAlgoConstraint { * Serialize an input to the storage format: * algotype:hash */ - def serialize(input: Array[Byte]): String = s"${prefix}:${hash(input)}" - def unserialize(value: String): PureResult[String] = HashAlgoConstraint.unserialize(value) match { + def serialize(input: Array[Byte]): String = s"${prefix}:${hash(input)}" + def unserialize(value: String): PureResult[String] = HashAlgoConstraint.unserialize(value) match { case Right((algo, v)) if algo == this => Right(v) case Right((algo, _)) => Left(Inconsistency(s"Bad algorithm prefix: found ${algo.prefix}, was expecting ${this.prefix}")) case Left(eb) => Left(eb) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala index 19a4d07b275..dc533cf0f7f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala @@ -402,7 +402,7 @@ object Variable { // define our own alternatives of matchCopy because we want v.values to be the default // values - def matchCopy(v: Variable): Variable = matchCopy(v, false) + def matchCopy(v: Variable): Variable = matchCopy(v, false) def matchCopy(v: Variable, setMultivalued: Boolean): Variable = matchCopy(v, v.values, setMultivalued) def matchCopy(v: Variable, values: Seq[String], setMultivalued: Boolean = false): Variable = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala index e69dfb4d299..84629181749 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala @@ -230,8 +230,8 @@ final case class SystemVariableSpec( override type T = SystemVariableSpec override type V = SystemVariable - override def cloneSetMultivalued: SystemVariableSpec = this.copy(multivalued = true) - def toVariable(values: Seq[String] = Seq()): SystemVariable = SystemVariable(this, values) + override def cloneSetMultivalued: SystemVariableSpec = this.copy(multivalued = true) + def toVariable(values: Seq[String] = Seq()): SystemVariable = SystemVariable(this, values) } /** @@ -257,8 +257,8 @@ final case class TrackerVariableSpec( override val multivalued = true override val longDescription = "" - override def cloneSetMultivalued: TrackerVariableSpec = this.copy() - def toVariable(values: Seq[String] = constraint.default.toSeq): TrackerVariable = TrackerVariable(this, values) + override def cloneSetMultivalued: TrackerVariableSpec = this.copy() + def toVariable(values: Seq[String] = constraint.default.toSeq): TrackerVariable = TrackerVariable(this, values) } /** @@ -295,8 +295,8 @@ final case class SelectVariableSpec( override type T = SelectVariableSpec override type V = SelectVariable - override def cloneSetMultivalued: SelectVariableSpec = this.copy(multivalued = true) - def toVariable(values: Seq[String] = constraint.default.toSeq): SelectVariable = SelectVariable(this, values) + override def cloneSetMultivalued: SelectVariableSpec = this.copy(multivalued = true) + def toVariable(values: Seq[String] = constraint.default.toSeq): SelectVariable = SelectVariable(this, values) } /** @@ -316,8 +316,8 @@ final case class SelectOneVariableSpec( override type T = SelectOneVariableSpec override type V = SelectOneVariable - override def cloneSetMultivalued: SelectOneVariableSpec = this.copy(multivalued = true) - def toVariable(values: Seq[String] = constraint.default.toSeq): SelectOneVariable = SelectOneVariable(this, values) + override def cloneSetMultivalued: SelectOneVariableSpec = this.copy(multivalued = true) + def toVariable(values: Seq[String] = constraint.default.toSeq): SelectOneVariable = SelectOneVariable(this, values) } /** @@ -367,8 +367,8 @@ final case class InputVariableSpec( override type T = InputVariableSpec override type V = InputVariable - override def cloneSetMultivalued: InputVariableSpec = this.copy(multivalued = true) - def toVariable(values: Seq[String] = constraint.default.toSeq): InputVariable = InputVariable(this, values) + override def cloneSetMultivalued: InputVariableSpec = this.copy(multivalued = true) + def toVariable(values: Seq[String] = constraint.default.toSeq): InputVariable = InputVariable(this, values) } /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala index f9451f8eab2..1774a5036b4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala @@ -112,7 +112,7 @@ trait TechniqueReader { * stream and any I/O exception. */ def getResourceContent[T](techniqueResourceId: TechniqueResourceId, postfixName: Option[String])( - useIt: Option[InputStream] => IOResult[T] + useIt: Option[InputStream] => IOResult[T] ): IOResult[T] /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala index 4839426fb55..4f9f40696b5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala @@ -413,7 +413,7 @@ class GitTechniqueReader( } override def getResourceContent[T](techniqueResourceId: TechniqueResourceId, postfixName: Option[String])( - useIt: Option[InputStream] => IOResult[T] + useIt: Option[InputStream] => IOResult[T] ): IOResult[T] = { // build a treewalk with the path, given by TechniqueTemplateId // here, we don't use rev in path, it will be used (if necessary) during walk diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala index 5bba5834b6b..9d0d6e5f0db 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala @@ -217,12 +217,12 @@ class TechniqueRepositoryImpl( techniqueReader.getMetadataContent(techniqueId)(useIt) override def getFileContent[T](techniqueResourceId: TechniqueResourceId)( - useIt: Option[InputStream] => IOResult[T] + useIt: Option[InputStream] => IOResult[T] ): IOResult[T] = techniqueReader.getResourceContent(techniqueResourceId, None)(useIt) override def getTemplateContent[T](techniqueResourceId: TechniqueResourceId)( - useIt: Option[InputStream] => IOResult[T] + useIt: Option[InputStream] => IOResult[T] ): IOResult[T] = techniqueReader.getResourceContent(techniqueResourceId, Some(TechniqueTemplate.templateExtension))(useIt) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala index b24e17f8e28..d238eb931e5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala @@ -105,7 +105,7 @@ class TechniqueParser( } otherAgents <- (xml \ "AGENT").toList.traverse(agent => parseAgentConfig(id, agent)).map(_.flatten) agentConfigs = (compatibilityAgent ++ otherAgents - // we need to filter back for totally empty agent (most likely default one added for nothing) + // we need to filter back for totally empty agent (most likely default one added for nothing) ).filter(a => !List(a.templates, a.files, a.bundlesequence, a.runHooks).forall(_.isEmpty)) _ <- { // all agent config types must be different val duplicated = diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala index 183a737f18b..8f28a3a480b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala @@ -193,7 +193,7 @@ object UnspecializedEventLog extends EventLogFilter { object EventLog { def withContent(nodes: NodeSeq): Elem = {nodes} - val emptyDetails: Elem = withContent(NodeSeq.Empty) + val emptyDetails: Elem = withContent(NodeSeq.Empty) } case object UnknownEventLogType extends NoRollbackEventLogType { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala index 2257751ad4f..b7152b6749c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala @@ -120,7 +120,7 @@ object JsonQueryObjects { List[Map[String, JQDirectiveSection]] ], // Map is necessary b/c of the "var" in {"vars": [ {"var": { "name":..., "value":... }}} - vars: Option[List[Map[String, JQDirectiveSectionVar]]] + vars: Option[List[Map[String, JQDirectiveSectionVar]]] ) { def toSectionVal: (String, SectionVal) = { ( @@ -465,7 +465,7 @@ class ZioJsonExtractor(queryParser: CmdbQueryParser with JsonQueryLexer) { * Utilities to extract values from params Map */ implicit class Extract(params: Map[String, List[String]]) { - def optGet(key: String): Option[String] = params.get(key).flatMap(_.headOption) + def optGet(key: String): Option[String] = params.get(key).flatMap(_.headOption) def parse[A](key: String, decoder: JsonDecoder[A]): PureResult[Option[A]] = { optGet(key) match { case None => Right(None) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala index dd98d2cb745..547fed69b1f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala @@ -143,10 +143,10 @@ object JsonResponseObjects { value: String ) final case class JRDirectiveSection( - name: String, // we have one more "var" indirection level between a var and its details: + name: String, // we have one more "var" indirection level between a var and its details: // { vars":[ { "var":{ "name": .... } }, { "var": { ... }} ] - vars: Option[ + vars: Option[ List[Map[String, JRDirectiveSectionVar]] ], // we have one more "section" indirection level between a section and its details: // { sections":[ { "section":{ "name": .... } }, { "section": { ... }} ] @@ -601,7 +601,7 @@ object JsonResponseObjects { object JRGlobalParameter { import GenericProperty._ - def empty(name: String): JRGlobalParameter = JRGlobalParameter(None, name, "".toConfigValue, "", None, None) + def empty(name: String): JRGlobalParameter = JRGlobalParameter(None, name, "".toConfigValue, "", None, None) def fromGlobalParameter(p: GlobalParameter, crId: Option[ChangeRequestId]): JRGlobalParameter = { JRGlobalParameter(crId.map(_.value.toString), p.name, p.value, p.description, p.inheritMode, p.provider) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala index 67a3b3fa400..84bdadf1077 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala @@ -95,20 +95,20 @@ trait RestDataSerializer { def serializeGroup(group: NodeGroup, cat: Option[NodeGroupCategoryId], crId: Option[ChangeRequestId]): JValue def serializeGroupCategory( - category: FullNodeGroupCategory, - parent: NodeGroupCategoryId, - detailLevel: DetailLevel, - apiVersion: ApiVersion + category: FullNodeGroupCategory, + parent: NodeGroupCategoryId, + detailLevel: DetailLevel, + apiVersion: ApiVersion ): JValue def serializeParameter(parameter: GlobalParameter, crId: Option[ChangeRequestId]): JValue def serializeRule(rule: Rule, crId: Option[ChangeRequestId]): JValue def serializeRuleCategory( - category: RuleCategory, - parent: RuleCategoryId, - rules: Map[RuleCategoryId, Seq[Rule]], - detailLevel: DetailLevel + category: RuleCategory, + parent: RuleCategoryId, + rules: Map[RuleCategoryId, Seq[Rule]], + detailLevel: DetailLevel ): JValue def serializeServerInfo(srv: Srv, status: String): JValue @@ -361,7 +361,7 @@ final case class RestDataSerializerImpl( def serializeRuleDiff(diff: ModifyRuleDiff, initialState: Rule): JValue = { def convertDirectives(dl: Set[DirectiveId]): JValue = dl.map(d => JString(d.serialize)).toList - def convertTargets(t: Set[RuleTarget]): JValue = t.map(_.target).toList + def convertTargets(t: Set[RuleTarget]): JValue = t.map(_.target).toList val name: JValue = diff.modName.map(displaySimpleDiff(_)).getOrElse(initialState.name) val shortDescription: JValue = diff.modShortDescription.map(displaySimpleDiff(_)).getOrElse(initialState.shortDescription) @@ -459,8 +459,8 @@ final case class RestDataSerializerImpl( def serializeNodeGroupDiff(diff: ModifyNodeGroupDiff, initialState: NodeGroup): JValue = { implicit def convert[T](value: GroupProperty): JValue = value.toJson - def convertNodeList(nl: Set[NodeId]): JValue = nl.map(_.value).toList - def convertQuery(q: Option[Query]): JValue = q.map(_.toString) + def convertNodeList(nl: Set[NodeId]): JValue = nl.map(_.value).toList + def convertQuery(q: Option[Query]): JValue = q.map(_.toString) val name: JValue = diff.modName.map(displaySimpleDiff(_)).getOrElse(initialState.name) val description: JValue = diff.modDescription.map(displaySimpleDiff(_)).getOrElse(initialState.description) @@ -521,17 +521,17 @@ final case class RestDataSerializerImpl( // This is in a try/catch because directiveValToSectionVal may fail (it can throw exceptions, so we need to catch them) try { def convertParameters(sv: SectionVal): JValue = serializeSectionVal(sv) - val name: JValue = diff.modName.map(displaySimpleDiff(_)).getOrElse(initialState.name) - val shortDescription: JValue = diff.modShortDescription.map(displaySimpleDiff(_)).getOrElse(initialState.shortDescription) - val longDescription: JValue = diff.modLongDescription.map(displaySimpleDiff(_)).getOrElse(initialState.longDescription) - val techniqueVersion: JValue = + val name: JValue = diff.modName.map(displaySimpleDiff(_)).getOrElse(initialState.name) + val shortDescription: JValue = diff.modShortDescription.map(displaySimpleDiff(_)).getOrElse(initialState.shortDescription) + val longDescription: JValue = diff.modLongDescription.map(displaySimpleDiff(_)).getOrElse(initialState.longDescription) + val techniqueVersion: JValue = diff.modTechniqueVersion.map(displaySimpleDiff(_)(_.serialize)).getOrElse(initialState.techniqueVersion.serialize) - val priority: JValue = diff.modPriority.map(displaySimpleDiff(_)).getOrElse(initialState.priority) - val enabled: JValue = diff.modIsActivated.map(displaySimpleDiff(_)).getOrElse(initialState.isEnabled) - val initialParams: JValue = serializeSectionVal( + val priority: JValue = diff.modPriority.map(displaySimpleDiff(_)).getOrElse(initialState.priority) + val enabled: JValue = diff.modIsActivated.map(displaySimpleDiff(_)).getOrElse(initialState.isEnabled) + val initialParams: JValue = serializeSectionVal( SectionVal.directiveValToSectionVal(initialRootSection, initialState.parameters) ) - val parameters: JValue = diff.modParameters.map(displaySimpleDiff(_)(convertParameters)).getOrElse(initialParams) + val parameters: JValue = diff.modParameters.map(displaySimpleDiff(_)(convertParameters)).getOrElse(initialParams) Full( ("id" -> initialState.id.serialize) ~ ("displayName" -> name) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala index d01c49243ea..1d711a38857 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala @@ -83,10 +83,10 @@ trait AbstractScheduler { type T private val schedulerMinimumIntervalTime: Duration = 1.second private val schedulerMaximumIntervalTime: Duration = 5.minutes - def updateInterval: Duration - def executeTask: Long => Box[T] - def displayName: String - def propertyName: String + def updateInterval: Duration + def executeTask: Long => Box[T] + def displayName: String + def propertyName: String val logger = ScheduledJobLogger diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala index 69139c4d538..681adbbac68 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala @@ -54,12 +54,12 @@ trait CampaignEventRepository { def saveCampaignEvent(c: CampaignEvent): IOResult[CampaignEvent] def numberOfEventsByCampaign(campaignId: CampaignId): IOResult[Int] def deleteEvent( - id: Option[CampaignEventId] = None, - states: List[String] = Nil, - campaignType: Option[CampaignType] = None, - campaignId: Option[CampaignId] = None, - afterDate: Option[DateTime] = None, - beforeDate: Option[DateTime] = None + id: Option[CampaignEventId] = None, + states: List[String] = Nil, + campaignType: Option[CampaignType] = None, + campaignId: Option[CampaignId] = None, + afterDate: Option[DateTime] = None, + beforeDate: Option[DateTime] = None ): IOResult[Unit] /* diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala index c974587f0aa..651ad3320b3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala @@ -93,8 +93,8 @@ class CampaignSerializer { def addJsonTranslater(c: JSONTranslateCampaign): Unit = tranlaters = c :: tranlaters - def serialize(campaign: Campaign): IOResult[String] = getJson(campaign).map(_.toJsonPretty) - def parse(string: String): IOResult[Campaign] = { + def serialize(campaign: Campaign): IOResult[String] = getJson(campaign).map(_.toJsonPretty) + def parse(string: String): IOResult[Campaign] = { for { baseInfo <- string.fromJson[CampaignParsingInfo].toIO res <- tranlaters.map(_.read()).fold(readBase) { case (a, b) => b orElse a }((string, baseInfo)) @@ -102,7 +102,7 @@ class CampaignSerializer { res } } - def campaignType(string: String): CampaignType = + def campaignType(string: String): CampaignType = tranlaters.map(_.campaignType()).fold(campaignTypeBase) { case (a, b) => b orElse a }(string) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala index a71831846fb..068eeae4ee9 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala @@ -203,9 +203,9 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { val rootCategoryId: ActiveTechniqueCategoryId = ActiveTechniqueCategoryId(this.uuid) - def isACategory(e: LDAPEntry): Boolean = e.isA(OC_TECHNIQUE_CATEGORY) + def isACategory(e: LDAPEntry): Boolean = e.isA(OC_TECHNIQUE_CATEGORY) def isAnActiveTechnique(e: LDAPEntry): Boolean = e.isA(OC_ACTIVE_TECHNIQUE) - def isADirective(e: LDAPEntry): Boolean = e.isA(OC_DIRECTIVE) + def isADirective(e: LDAPEntry): Boolean = e.isA(OC_DIRECTIVE) /** * From a DN of a category, return the value of the rdn (uuid) @@ -244,7 +244,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { mod } - def buildRDN(rdn: String): RDN = new RDN(A_ACTIVE_TECHNIQUE_UUID, rdn) + def buildRDN(rdn: String): RDN = new RDN(A_ACTIVE_TECHNIQUE_UUID, rdn) def buildCategoryRDN(rdn: String): RDN = new RDN(A_TECHNIQUE_CATEGORY_UUID, rdn) def directiveModel(uuid: DirectiveUid, rev: Revision, techniqueVersion: TechniqueVersion, parentDN: DN): LDAPEntry = { @@ -359,8 +359,8 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { val rootCategoryId: NodeGroupCategoryId = NodeGroupCategoryId(this.uuid) - def isACategory(e: LDAPEntry): Boolean = e.isA(OC_GROUP_CATEGORY) - def isAGroup(e: LDAPEntry): Boolean = e.isA(OC_RUDDER_NODE_GROUP) + def isACategory(e: LDAPEntry): Boolean = e.isA(OC_GROUP_CATEGORY) + def isAGroup(e: LDAPEntry): Boolean = e.isA(OC_RUDDER_NODE_GROUP) def isASpecialTarget(e: LDAPEntry): Boolean = e.isA(OC_SPECIAL_TARGET) /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala index a2cd293dbe4..181e886688c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala @@ -286,7 +286,7 @@ object RudderLDAPConstants extends Loggable { */ def toPartial[A, B](f: A => Option[B]) = new PartialFunction[A, B] { override def isDefinedAt(x: A) = f(x).isDefined - override def apply(x: A) = f(x).get + override def apply(x: A) = f(x).get } variables diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala index 687c46667c5..5559a84c1b8 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala @@ -59,7 +59,7 @@ object ChangeRequestLogsFilter { * Event log on change request */ sealed trait ChangeRequestDiff { - def changeRequest: ChangeRequest + def changeRequest: ChangeRequest def diffName: Option[SimpleDiff[String]] = None def diffDescription: Option[SimpleDiff[String]] = None } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala index e7f3c2ff1b0..85230e508be 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala @@ -59,8 +59,8 @@ final case class PromoteNode( } object PromoteNode extends EventLogFilter { - override val eventType: EventLogType = PromoteNodeToRelayEventType - override def apply(x: (EventLogType, EventLogDetails)): PromoteNode = PromoteNode(x._2) + override val eventType: EventLogType = PromoteNodeToRelayEventType + override def apply(x: (EventLogType, EventLogDetails)): PromoteNode = PromoteNode(x._2) } final case class DemoteRelay( @@ -70,8 +70,8 @@ final case class DemoteRelay( } object DemoteRelay extends EventLogFilter { - override val eventType: EventLogType = DemoteRelayToNodeEventType - override def apply(x: (EventLogType, EventLogDetails)): DemoteRelay = DemoteRelay(x._2) + override val eventType: EventLogType = DemoteRelayToNodeEventType + override def apply(x: (EventLogType, EventLogDetails)): DemoteRelay = DemoteRelay(x._2) } object NodeEventLogsFilter { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala index d87630de43d..4a268a75882 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala @@ -127,7 +127,7 @@ final case class AddTechnique( } object AddTechnique extends EventLogFilter { - override val eventType: EventLogType = AddTechniqueEventType + override val eventType: EventLogType = AddTechniqueEventType override def apply(x: (EventLogType, EventLogDetails)): AddTechnique = AddTechnique(x._2) } @@ -139,7 +139,7 @@ final case class ModifyTechnique( } object ModifyTechnique extends EventLogFilter { - override val eventType: EventLogType = ModifyTechniqueEventType + override val eventType: EventLogType = ModifyTechniqueEventType override def apply(x: (EventLogType, EventLogDetails)): ModifyTechnique = ModifyTechnique(x._2) } @@ -151,6 +151,6 @@ final case class DeleteTechnique( } object DeleteTechnique extends EventLogFilter { - override val eventType: EventLogType = DeleteTechniqueEventType + override val eventType: EventLogType = DeleteTechniqueEventType override def apply(x: (EventLogType, EventLogDetails)): DeleteTechnique = DeleteTechnique(x._2) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala index 3b4373e7a57..d78b93b8d8d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala @@ -153,7 +153,7 @@ sealed trait TargetComposition extends CompositeRuleTarget { * Union of all Targets, Should take all Nodes from these targets */ final case class TargetUnion(targets: Set[RuleTarget] = Set()) extends TargetComposition { - override val toJson: JValue = { + override val toJson: JValue = { ("or" -> targets.map(_.toJson)) } def addTarget(target: RuleTarget): TargetComposition = TargetUnion(targets + target) @@ -163,7 +163,7 @@ final case class TargetUnion(targets: Set[RuleTarget] = Set()) extends TargetCom * Intersection of all Targets, Should take Nodes belongings to all targets */ final case class TargetIntersection(targets: Set[RuleTarget] = Set()) extends TargetComposition { - override val toJson: JValue = { + override val toJson: JValue = { ("and" -> targets.map(_.toJson)) } def addTarget(target: RuleTarget): TargetComposition = TargetIntersection(targets + target) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala index 997a97d9563..205000898bb 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala @@ -53,10 +53,10 @@ object SimpleDiff { ) } - def stringToXml(eltTag: Elem, diff: SimpleDiff[String]): NodeSeq = toXml[String](eltTag, diff)(s => Text(s)) + def stringToXml(eltTag: Elem, diff: SimpleDiff[String]): NodeSeq = toXml[String](eltTag, diff)(s => Text(s)) def booleanToXml(eltTag: Elem, diff: SimpleDiff[Boolean]): NodeSeq = toXml[Boolean](eltTag, diff)(s => Text(s.toString)) - def intToXml(eltTag: Elem, diff: SimpleDiff[Int]): NodeSeq = toXml[Int](eltTag, diff)(s => Text(s.toString)) - def floatToXml(eltTag: Elem, diff: SimpleDiff[Float]): NodeSeq = toXml[Float](eltTag, diff)(s => Text(s.toString)) - def longToXml(eltTag: Elem, diff: SimpleDiff[Long]): NodeSeq = toXml[Long](eltTag, diff)(s => Text(s.toString)) - def doubleToXml(eltTag: Elem, diff: SimpleDiff[Double]): NodeSeq = toXml[Double](eltTag, diff)(s => Text(s.toString)) + def intToXml(eltTag: Elem, diff: SimpleDiff[Int]): NodeSeq = toXml[Int](eltTag, diff)(s => Text(s.toString)) + def floatToXml(eltTag: Elem, diff: SimpleDiff[Float]): NodeSeq = toXml[Float](eltTag, diff)(s => Text(s.toString)) + def longToXml(eltTag: Elem, diff: SimpleDiff[Long]): NodeSeq = toXml[Long](eltTag, diff)(s => Text(s.toString)) + def doubleToXml(eltTag: Elem, diff: SimpleDiff[Double]): NodeSeq = toXml[Double](eltTag, diff)(s => Text(s.toString)) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala index df493fbee6a..8adce515c42 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala @@ -46,7 +46,7 @@ import net.liftweb.common._ */ object Tag { - implicit def tagName(value: String): TagName = TagName(value) + implicit def tagName(value: String): TagName = TagName(value) implicit def tagValue(value: String): TagValue = TagValue(value) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala index 28f4e794e33..bca6b4feb01 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala @@ -99,7 +99,7 @@ object InheritMode { final case object Override extends ObjectMode { override val value = 'o' } final case object Merge extends ObjectMode { override val value = 'm' } - def all: List[ObjectMode] = ca.mrvisser.sealerate.values[ObjectMode].toList + def all: List[ObjectMode] = ca.mrvisser.sealerate.values[ObjectMode].toList def parse(c: Char): Option[ObjectMode] = all.find(c == _.value) } sealed trait ArrayMode { def value: Char } @@ -108,7 +108,7 @@ object InheritMode { final case object Append extends ArrayMode { override val value = 'a' } final case object Prepend extends ArrayMode { override val value = 'p' } - def all: List[ArrayMode] = ca.mrvisser.sealerate.values[ArrayMode].toList + def all: List[ArrayMode] = ca.mrvisser.sealerate.values[ArrayMode].toList def parse(c: Char): Option[ArrayMode] = all.find(c == _.value) } sealed trait StringMode { def value: Char } @@ -117,7 +117,7 @@ object InheritMode { final case object Append extends StringMode { override val value = 'a' } final case object Prepend extends StringMode { override val value = 'p' } - def all: List[StringMode] = ca.mrvisser.sealerate.values[StringMode].toList + def all: List[StringMode] = ca.mrvisser.sealerate.values[StringMode].toList def parse(c: Char): Option[StringMode] = all.find(c == _.value) } @@ -195,13 +195,13 @@ sealed trait GenericProperty[P <: GenericProperty[_]] { GenericProperty.getMode(config) } - final def withName(name: String): P = patch(PatchProperty(name = Some(name))) - final def withValue(value: ConfigValue): P = patch(PatchProperty(value = Some(value))) - final def withValue(value: String): P = patch(PatchProperty(value = Some(value.toConfigValue))) - final def withProvider(p: PropertyProvider): P = patch(PatchProperty(provider = Some(p))) - final def withDescription(d: String): P = patch(PatchProperty(description = Some(d))) - final def withMode(m: InheritMode): P = patch(PatchProperty(inheritMode = Some(m))) - final def patch(p: PatchProperty): P = { + final def withName(name: String): P = patch(PatchProperty(name = Some(name))) + final def withValue(value: ConfigValue): P = patch(PatchProperty(value = Some(value))) + final def withValue(value: String): P = patch(PatchProperty(value = Some(value.toConfigValue))) + final def withProvider(p: PropertyProvider): P = patch(PatchProperty(provider = Some(p))) + final def withDescription(d: String): P = patch(PatchProperty(description = Some(d))) + final def withMode(m: InheritMode): P = patch(PatchProperty(inheritMode = Some(m))) + final def patch(p: PatchProperty): P = { def patchOne[A](key: String, update: Option[A], toValue: A => ConfigValue)(c: Config): Config = { update match { case None => c @@ -219,7 +219,7 @@ sealed trait GenericProperty[P <: GenericProperty[_]] { ).foldLeft(config) { case (c, patchStep) => patchStep(c) } ) } - override def toString: String = + override def toString: String = this.getClass.getSimpleName + "(" + this.config.root.render(ConfigRenderOptions.defaults()) + ")" } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala index 59fc67e7ce8..b6408fd4292 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala @@ -142,7 +142,7 @@ object NodePropertyMatcherUtils { sealed trait ComparatorList { - def comparators: Seq[CriterionComparator] + def comparators: Seq[CriterionComparator] def comparatorForString(s: String): Option[CriterionComparator] = { for (comp <- comparators) { if (s.equalsIgnoreCase(comp.id)) return Some(comp) @@ -165,9 +165,9 @@ sealed trait CriterionType extends ComparatorList { * for the field. * DO NOT FORGET TO USE attrs ! (especially 'id') */ - def toForm(value: String, func: String => Any, attrs: (String, String)*): Elem = SHtml.text(value, func, attrs: _*) - def initForm(formId: String): JsCmd = Noop - def destroyForm(formId: String): JsCmd = { + def toForm(value: String, func: String => Any, attrs: (String, String)*): Elem = SHtml.text(value, func, attrs: _*) + def initForm(formId: String): JsCmd = Noop + def destroyForm(formId: String): JsCmd = { OnLoad( JsRaw( """$('#%s').datepicker( "destroy" );""".format(formId) @@ -175,7 +175,7 @@ sealed trait CriterionType extends ComparatorList { ) } // Base validation, subclass only have to define validateSubCase - def validate(value: String, compName: String): PureResult[String] = comparatorForString(compName) match { + def validate(value: String, compName: String): PureResult[String] = comparatorForString(compName) match { case Some(c) => c match { case Exists | NotExists => Right(value) // ok, just ignored it @@ -220,7 +220,7 @@ object NodeInfoMatcher { // default builder: it will evaluated each time, sufficient if all parts of the matcher uses NodeInfo def apply(s: String, f: NodeInfo => Boolean): NodeInfoMatcher = { new NodeInfoMatcher { - override val debugString: String = s + override val debugString: String = s override def matches(node: NodeInfo): Boolean = f(node) } } @@ -487,7 +487,7 @@ sealed trait LDAPCriterionType extends CriterionType { // transform the given value to its LDAP string value def toLDAP(value: String): PureResult[String] - def buildRegex(attribute: String, value: String): PureResult[RegexFilter] = Right(SimpleRegexFilter(attribute, value)) + def buildRegex(attribute: String, value: String): PureResult[RegexFilter] = Right(SimpleRegexFilter(attribute, value)) def buildNotRegex(attribute: String, value: String): PureResult[NotRegexFilter] = Right(SimpleNotRegexFilter(attribute, value)) // build the ldap filter for given attribute name and comparator @@ -512,7 +512,7 @@ sealed trait LDAPCriterionType extends CriterionType { //a comparator type with undefined comparators final case class BareComparator(override val comparators: CriterionComparator*) extends LDAPCriterionType { override protected def validateSubCase(v: String, comparator: CriterionComparator): PureResult[String] = Right(v) - override def toLDAP(value: String): PureResult[String] = Right(value) + override def toLDAP(value: String): PureResult[String] = Right(value) } sealed trait TStringComparator extends LDAPCriterionType { @@ -526,7 +526,7 @@ sealed trait TStringComparator extends LDAPCriterionType { } } } - override def toLDAP(value: String): PureResult[String] = Right(value) + override def toLDAP(value: String): PureResult[String] = Right(value) protected def escapedFilter(attributeName: String, value: String): Filter = { BuildFilter(attributeName + "=" + Filter.encodeValue(value)) @@ -583,20 +583,20 @@ case object DateComparator extends LDAPCriterionType { s"Invalid date: '${value}', expected format is: '${fmt}'. Error was: ${e.getMessage}" ) - override protected def validateSubCase(v: String, comparator: CriterionComparator): PureResult[String] = try { + override protected def validateSubCase(v: String, comparator: CriterionComparator): PureResult[String] = try { Right(frenchFmt.parseDateTime(v).toString) } catch { case e: Exception => Left(error(v, e)) } // init a jquery datepicker - override def initForm(formId: String): JsCmd = OnLoad(JsRaw("""var init = $.datepicker.regional['en']; + override def initForm(formId: String): JsCmd = OnLoad(JsRaw("""var init = $.datepicker.regional['en']; init['showOn'] = 'focus'; init['dateFormat'] = 'dd/mm/yy'; $('#%s').datepicker(init); """.format(formId))) - override def destroyForm(formId: String): JsCmd = OnLoad(JsRaw("""$('#%s').datepicker( "destroy" );""".format(formId))) - override def toLDAP(value: String): Either[RudderError, String] = parseDate(value).map(GeneralizedTime(_).toString) + override def destroyForm(formId: String): JsCmd = OnLoad(JsRaw("""$('#%s').datepicker( "destroy" );""".format(formId))) + override def toLDAP(value: String): Either[RudderError, String] = parseDate(value).map(GeneralizedTime(_).toString) private[this] def parseDate(value: String): PureResult[DateTime] = try { val date = frenchFmt.parseDateTime(value) @@ -777,7 +777,7 @@ case object AgentComparator extends LDAPCriterionType { override protected def validateSubCase(v: String, comparator: CriterionComparator): PureResult[String] = { if (null == v || v.isEmpty) Left(Inconsistency("Empty string not allowed")) else Right(v) } - override def toLDAP(value: String): PureResult[String] = Right(value) + override def toLDAP(value: String): PureResult[String] = Right(value) /* * We need compatibility for < 4.2 inventory @@ -833,7 +833,7 @@ case object EditorComparator extends LDAPCriterionType { attrs: _* ) } - override def toLDAP(value: String): PureResult[String] = Right(value) + override def toLDAP(value: String): PureResult[String] = Right(value) } /* diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala index 0a1a3ca960d..f01c48cacda 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala @@ -407,7 +407,7 @@ final case class DebugInfo(comparatorName: String, value: Option[String]) { } final case class MatchHolderZio[A](debug: DebugInfo, values: Chunk[A], matcher: Chunk[A] => IOResult[Boolean])(implicit - serializer: A => String + serializer: A => String ) { def matches: ZIO[Any, RudderError, Boolean] = for { res <- matcher(values) @@ -417,7 +417,7 @@ final case class MatchHolderZio[A](debug: DebugInfo, values: Chunk[A], matcher: object MatchHolder { def apply[A](debugInfo: DebugInfo, values: Chunk[A], matcher: Chunk[A] => Boolean)(implicit - serializer: A => String + serializer: A => String ): MatchHolderZio[A] = { MatchHolderZio[A](debugInfo, values, (vs: Chunk[A]) => matcher(vs).succeed) } @@ -514,22 +514,22 @@ trait NodeCriterionOrderedValueMatcher[A] extends NodeCriterionMatcher { final case class NodeCriterionMatcherString(extractor: CoreNodeFact => Chunk[String]) extends NodeCriterionOrderedValueMatcher[String] { - override def parseNum(value: String): Option[String] = Some(value) - override def serialise(a: String): String = a - val order: Ordering[String] = Ordering.String + override def parseNum(value: String): Option[String] = Some(value) + override def serialise(a: String): String = a + val order: Ordering[String] = Ordering.String } final case class NodeCriterionMatcherInt(extractor: CoreNodeFact => Chunk[Int]) extends NodeCriterionOrderedValueMatcher[Int] { override def parseNum(value: String): Option[Int] = try { Some(Integer.parseInt(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Int): String = a.toString + override def serialise(a: Int): String = a.toString val order: Ordering[Int] = Ordering.Int } final case class NodeCriterionMatcherLong(extractor: CoreNodeFact => Chunk[Long]) extends NodeCriterionOrderedValueMatcher[Long] { override def parseNum(value: String): Option[Long] = try { Some(java.lang.Long.parseLong(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Long): String = a.toString + override def serialise(a: Long): String = a.toString val order: Ordering[Long] = Ordering.Long } @@ -537,7 +537,7 @@ final case class NodeCriterionMatcherFloat(extractor: CoreNodeFact => Chunk[Floa extends NodeCriterionOrderedValueMatcher[Float] { override def parseNum(value: String): Option[Float] = try { Some(java.lang.Float.parseFloat(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Float): String = a.toString + override def serialise(a: Float): String = a.toString val order: Ordering[Float] = Ordering.Float.TotalOrdering } @@ -545,7 +545,7 @@ final case class NodeCriterionMatcherDouble(extractor: CoreNodeFact => Chunk[Dou extends NodeCriterionOrderedValueMatcher[Double] { override def parseNum(value: String): Option[Double] = try { Some(java.lang.Double.parseDouble(value)) } catch { case ex: NumberFormatException => None } - override def serialise(a: Double): String = a.toString + override def serialise(a: Double): String = a.toString val order: Ordering[Double] = Ordering.Double.TotalOrdering } @@ -556,10 +556,10 @@ final case class NodeCriterionMatcherDate(extractorNode: CoreNodeFact => Chunk[D // we need to accept both ISO format and old dd/MM/YYYY format for compatibility // also, we discard the time, only keep date - override def extractor: CoreNodeFact => Chunk[DateTime] = (n: CoreNodeFact) => extractorNode(n).map(_.withTimeAtStartOfDay()) - override def parseNum(value: String): Option[DateTime] = parseDate(value).map(_.withTimeAtStartOfDay()) - override def serialise(a: DateTime): String = DateFormaterService.serialize(a) - val order: Ordering[DateTime] = Ordering.by(_.getMillis) + override def extractor: CoreNodeFact => Chunk[DateTime] = (n: CoreNodeFact) => extractorNode(n).map(_.withTimeAtStartOfDay()) + override def parseNum(value: String): Option[DateTime] = parseDate(value).map(_.withTimeAtStartOfDay()) + override def serialise(a: DateTime): String = DateFormaterService.serialize(a) + val order: Ordering[DateTime] = Ordering.by(_.getMillis) } /* @@ -726,8 +726,8 @@ object NodePropertiesMatcher extends NodeCriterionKeyValueMatcher[NodeProperty] /* * Node properties search are done on both node properties and inventory custom properties */ - override def extractor: CoreNodeFact => Chunk[NodeProperty] = { (n: CoreNodeFact) => n.properties } - override def serialise(a: NodeProperty): String = s"""${a.name}=${a.valueAsString}""" - override def getKey(a: NodeProperty): String = a.name - override def getValue(a: NodeProperty): String = a.valueAsString + override def extractor: CoreNodeFact => Chunk[NodeProperty] = { (n: CoreNodeFact) => n.properties } + override def serialise(a: NodeProperty): String = s"""${a.name}=${a.valueAsString}""" + override def getKey(a: NodeProperty): String = a.name + override def getValue(a: NodeProperty): String = a.valueAsString } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala index 30f75ce0fb4..8fc060f673c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala @@ -13,10 +13,10 @@ import org.joda.time.DateTime */ sealed trait CleanReportAction { - def name: String - def past: String - def continue: String - def actor: DatabaseCleanerActor + def name: String + def past: String + def continue: String + def actor: DatabaseCleanerActor def actorIsIdle: Boolean = actor.isIdle def progress: String = if (actor.isIdle) "idle" else "in progress" def act(reports: DeleteCommand.Reports, complianceLevel: Option[DeleteCommand.ComplianceLevel]): Box[Int] diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala index 873df4d5bdf..7a08e0e4bd5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala @@ -89,7 +89,7 @@ final case class CompliancePercent( nonCompliant: Double = 0, auditError: Double = 0, badPolicyMode: Double = 0 -)(val precision: CompliancePrecision = Level0) { +)(val precision: CompliancePrecision = Level0) { val compliance: Double = success + repaired + notApplicable + compliant + auditNotApplicable } @@ -415,7 +415,7 @@ final case class ComplianceLevel( ) } - def +(report: ReportType): ComplianceLevel = this + ComplianceLevel.compute(Seq(report)) + def +(report: ReportType): ComplianceLevel = this + ComplianceLevel.compute(Seq(report)) def +(reports: Iterable[ReportType]): ComplianceLevel = this + ComplianceLevel.compute(reports) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala index ea73267dc96..424231cdb1a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala @@ -532,7 +532,7 @@ object ExpectedReportsSerialisation { // invariance is complicated def toRight(x: JsonExpectedValueId7_1): Either[List[String], JsonExpectedValueId7_1] = Right(x) - def toLeft(x: List[String]): Either[List[String], JsonExpectedValueId7_1] = Left(x) + def toLeft(x: List[String]): Either[List[String], JsonExpectedValueId7_1] = Left(x) JsonDecoder[List[String]].map(toLeft).orElse(decodeJsonExpectedValueId7_1.map(toRight)) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala index d40ff4e49c1..78913bb9ee3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala @@ -1407,15 +1407,15 @@ object SelectFacts { } final case class NodeFact( - id: NodeId, - description: Option[String], + id: NodeId, + description: Option[String], @jsonField("hostname") - fqdn: String, - os: OsDetails, - machine: MachineInfo, - rudderSettings: RudderSettings, - rudderAgent: RudderAgent, - properties: Chunk[NodeProperty], + fqdn: String, + os: OsDetails, + machine: MachineInfo, + rudderSettings: RudderSettings, + rudderAgent: RudderAgent, + properties: Chunk[NodeProperty], // what the point ? Derive from RudderAgent ? At least details. // managementTechnology: Chunk[ManagementTechnology], // managementTechnologyDetails: ManagementTechnologyDetails, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala index f278eff2cdf..db8b55e775e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala @@ -100,7 +100,7 @@ trait NodeFactRepository { * Translation between old inventory status and new SelectNodeStatus for IOResult methods */ def statusCompat[A](status: InventoryStatus, f: (QueryContext, SelectNodeStatus) => IOResult[A])(implicit - qc: QueryContext + qc: QueryContext ): IOResult[A] = { status match { case AcceptedInventory => f(qc, SelectNodeStatus.Accepted) @@ -113,7 +113,7 @@ trait NodeFactRepository { * Translation between old inventory status and new SelectNodeStatus for IOStream methods */ def statusStreamCompat[A](status: InventoryStatus, f: (QueryContext, SelectNodeStatus) => IOStream[A])(implicit - qc: QueryContext + qc: QueryContext ): IOStream[A] = { status match { case AcceptedInventory => f(qc, SelectNodeStatus.Accepted) @@ -126,7 +126,7 @@ trait NodeFactRepository { * Get node on given status */ def get( - nodeId: NodeId + nodeId: NodeId )(implicit qc: QueryContext, status: SelectNodeStatus = SelectNodeStatus.Any): IOResult[Option[CoreNodeFact]] def getCompat(nodeId: NodeId, status: InventoryStatus)(implicit qc: QueryContext): IOResult[Option[CoreNodeFact]] = { @@ -138,13 +138,13 @@ trait NodeFactRepository { * the fields from select mode "ignored" set to empty. */ def slowGet(nodeId: NodeId)(implicit - qc: QueryContext, - status: SelectNodeStatus = SelectNodeStatus.Any, - attrs: SelectFacts = SelectFacts.default + qc: QueryContext, + status: SelectNodeStatus = SelectNodeStatus.Any, + attrs: SelectFacts = SelectFacts.default ): IOResult[Option[NodeFact]] def slowGetCompat(nodeId: NodeId, status: InventoryStatus, attrs: SelectFacts)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Option[NodeFact]] = { statusCompat(status, (qc, s) => slowGet(nodeId)(qc, s, attrs)) } @@ -163,7 +163,7 @@ trait NodeFactRepository { ): IOResult[MapView[NodeId, CoreNodeFact]] def getAllCompat(status: InventoryStatus, attrs: SelectFacts)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[MapView[NodeId, CoreNodeFact]] = { statusCompat(status, (qc, s) => getAll()(qc, s)) } @@ -194,7 +194,7 @@ trait NodeFactRepository { * SecurityTag must not be updated with that method, but it can be initially set. */ def save( - nodeFact: NodeFact + nodeFact: NodeFact )(implicit cc: ChangeContext, attrs: SelectFacts = SelectFacts.all): IOResult[NodeFactChangeEventCC] /* @@ -224,7 +224,7 @@ trait NodeFactRepository { * pending or in accepted. */ def updateInventory(inventory: FullInventory, software: Option[Iterable[Software]])(implicit - cc: ChangeContext + cc: ChangeContext ): IOResult[NodeFactChangeEventCC] /* @@ -234,7 +234,7 @@ trait NodeFactRepository { * - if target status is "removed", persisted inventory is deleted */ def changeStatus(nodeId: NodeId, into: InventoryStatus)(implicit - cc: ChangeContext + cc: ChangeContext ): IOResult[NodeFactChangeEventCC] /* @@ -385,7 +385,7 @@ class CoreNodeFactRepository( } private[nodes] def getOnRef(ref: Ref[Map[NodeId, CoreNodeFact]], nodeId: NodeId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Option[CoreNodeFact]] = { tenantService.nodeGetMapView(ref, nodeId) } @@ -420,7 +420,7 @@ class CoreNodeFactRepository( } override def get( - nodeId: NodeId + nodeId: NodeId )(implicit qc: QueryContext, status: SelectNodeStatus = SelectNodeStatus.Any): IOResult[Option[CoreNodeFact]] = { status match { case SelectNodeStatus.Pending => @@ -433,7 +433,7 @@ class CoreNodeFactRepository( } override def slowGet( - nodeId: NodeId + nodeId: NodeId )(implicit qc: QueryContext, status: SelectNodeStatus, attrs: SelectFacts): IOResult[Option[NodeFact]] = { for { optCNF <- get(nodeId)(qc, status) @@ -474,7 +474,7 @@ class CoreNodeFactRepository( } private[nodes] def getAllOnRef[A]( - ref: Ref[Map[NodeId, CoreNodeFact]] + ref: Ref[Map[NodeId, CoreNodeFact]] )(implicit qc: QueryContext): IOResult[MapView[NodeId, CoreNodeFact]] = { tenantService.nodeFilterMapView(ref) } @@ -680,7 +680,7 @@ class CoreNodeFactRepository( } override def changeStatus(nodeId: NodeId, into: InventoryStatus)(implicit - cc: ChangeContext + cc: ChangeContext ): IOResult[NodeFactChangeEventCC] = { if (nodeId == Constants.ROOT_POLICY_SERVER_ID && into != AcceptedInventory) { Inconsistency(s"Rudder server (id='root' must be accepted").fail @@ -768,7 +768,7 @@ class CoreNodeFactRepository( } override def updateInventory(inventory: FullInventory, software: Option[Iterable[Software]])(implicit - cc: ChangeContext + cc: ChangeContext ): IOResult[NodeFactChangeEventCC] = { val nodeId = inventory.node.main.id implicit val attrs = if (software.isEmpty) SelectFacts.noSoftware else SelectFacts.all diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala index fdde4df2761..f6261505daa 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala @@ -322,11 +322,11 @@ object NoopFactStorage extends NodeFactStorage { override def delete(nodeId: NodeId)(implicit attrs: SelectFacts): IOResult[StorageChangeEventDelete] = StorageChangeEventDelete.Noop(nodeId).succeed @nowarn("msg=parameter attrs in method getAllPending is never used") - override def getAllPending()(implicit attrs: SelectFacts = SelectFacts.default): IOStream[NodeFact] = ZStream.empty + override def getAllPending()(implicit attrs: SelectFacts = SelectFacts.default): IOStream[NodeFact] = ZStream.empty @nowarn("msg=parameter attrs in method getAllAccepted is never used") - override def getAllAccepted()(implicit attrs: SelectFacts = SelectFacts.default): IOStream[NodeFact] = ZStream.empty - override def getPending(nodeId: NodeId)(implicit attrs: SelectFacts): IOResult[Option[NodeFact]] = None.succeed - override def getAccepted(nodeId: NodeId)(implicit attrs: SelectFacts): IOResult[Option[NodeFact]] = None.succeed + override def getAllAccepted()(implicit attrs: SelectFacts = SelectFacts.default): IOStream[NodeFact] = ZStream.empty + override def getPending(nodeId: NodeId)(implicit attrs: SelectFacts): IOResult[Option[NodeFact]] = None.succeed + override def getAccepted(nodeId: NodeId)(implicit attrs: SelectFacts): IOResult[Option[NodeFact]] = None.succeed } /* diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala index fda9720eae8..6338ff66cb4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala @@ -89,8 +89,8 @@ object RunNuCommand { object SilentLogger extends BasePosixProcess(null) { import java.util.logging._ override def start(command: util.List[String], environment: Array[String], cwd: Path): NuProcess = null - override def run(command: util.List[String], environment: Array[String], cwd: Path): Unit = {} - def silent(): Unit = { + override def run(command: util.List[String], environment: Array[String], cwd: Path): Unit = {} + def silent(): Unit = { BasePosixProcess.LOGGER.setLevel(java.util.logging.Level.WARNING) BasePosixProcess.LOGGER.setUseParentHandlers(false) val h = new ConsoleHandler() diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala index 03e8ec55333..03d31d5fcf2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala @@ -98,7 +98,7 @@ object InventoryProcessingUtils { def makeManagedStream(file: File, kind: String = "inventory"): IOManaged[InputStream] = IOManaged.makeM[InputStream] { IOResult.attempt(s"Error when trying to read ${kind} file '${file.name}'")(file.newInputStream) }(_.close()) - def makeFileExists(file: File): IOManaged[Boolean] = IOManaged.make[Boolean](file.exists)(_ => ()) + def makeFileExists(file: File): IOManaged[Boolean] = IOManaged.make[Boolean](file.exists)(_ => ()) } /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala index 2d678713293..bf6e7587d07 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala @@ -183,8 +183,8 @@ final case class GenericMethod( String ], // New name of the method replacing this method, may be defined only if deprecated is defined. Maybe we should have a deprecation info object - renameTo: Option[String], - renameParam: Seq[(String, String)] + renameTo: Option[String], + renameParam: Seq[(String, String)] ) final case class MethodParameter( @@ -274,8 +274,8 @@ object ParameterType { } } - def addNewParameterService(service: ParameterTypeService): Unit = innerServices = service :: innerServices - private[this] var innerServices: List[ParameterTypeService] = new BasicParameterTypeService :: Nil + def addNewParameterService(service: ParameterTypeService): Unit = innerServices = service :: innerServices + private[this] var innerServices: List[ParameterTypeService] = new BasicParameterTypeService :: Nil } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala index a3aa2e44410..631e45206fe 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala @@ -726,7 +726,7 @@ class ClassicTechniqueWriter( // We need to add a reporting bundle for this method to generate a na report for any method with a condition != any/cfengine (which ~= true def truthyCondition(condition: String): Boolean = condition.isEmpty || condition == "any" || condition == "cfengine-community" def methodCallNeedReporting(methods: Map[BundleName, GenericMethod], parentBlock: List[MethodBlock])( - call: MethodCall + call: MethodCall ): Boolean = { val condition = formatCondition(call, parentBlock) methods @@ -736,7 +736,7 @@ class ClassicTechniqueWriter( } def elemNeedReportingBundle(methods: Map[BundleName, GenericMethod], parentBlock: List[MethodBlock])( - elem: MethodElem + elem: MethodElem ): Boolean = { elem match { case c: MethodCall => methodCallNeedReporting(methods, parentBlock)(c) @@ -1148,7 +1148,7 @@ class DSCTechniqueWriter( s"${getTechniqueRelativePath(technique)}}/${filename}" def formatDscMethodBlock(techniqueName: String, methods: Map[BundleName, GenericMethod], parentBlocks: List[MethodBlock])( - method: MethodElem + method: MethodElem ): PureResult[List[String]] = { method match { case c: MethodCall => diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala index 8490e6177e3..d5720983f93 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala @@ -73,9 +73,9 @@ class ReportsJdbcRepository(doobie: Doobie) extends ReportsRepository with Logga // just an utility to remove multiple spaces in query so that we can vertically align them an see what part are changing - the use // of greek p is to discurage use elsewhere private[this] def þ(s: String) = s.replaceAll("""\s+""", " ") - private[this] val baseQuery = þ(s"select ${common_reports_column} from RudderSysEvents where 1=1 ") - private[this] val typedQuery = þ(s"select ${typed_reports_column} from RudderSysEvents where 1=1 ") - private[this] val idQuery = þ(s"select id, ${common_reports_column} from ruddersysevents where 1=1 ") + private[this] val baseQuery = þ(s"select ${common_reports_column} from RudderSysEvents where 1=1 ") + private[this] val typedQuery = þ(s"select ${typed_reports_column} from RudderSysEvents where 1=1 ") + private[this] val idQuery = þ(s"select id, ${common_reports_column} from ruddersysevents where 1=1 ") // We assume that this method is called with a limited list of runs override def getExecutionReports( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala index 8934e20bf37..cda30b2191e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala @@ -171,15 +171,15 @@ object DataExtractor { object OptionnalJson extends DataExtractor[Option] { def monad = implicitly - def emptyValue[T](id: String): Box[Option[T]] = Full(None) - def getOrElse[T](value: Option[T], default: T): T = value.getOrElse(default) + def emptyValue[T](id: String): Box[Option[T]] = Full(None) + def getOrElse[T](value: Option[T], default: T): T = value.getOrElse(default) } type Id[X] = X object CompleteJson extends DataExtractor[Id] { def monad = implicitly - def emptyValue[T](id: String): Box[Id[T]] = Failure(s"parameter '${id}' cannot be empty") + def emptyValue[T](id: String): Box[Id[T]] = Failure(s"parameter '${id}' cannot be empty") def getOrElse[T](value: T, default: T) = value } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala index a237d4bf50e..fed66a92483 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala @@ -91,8 +91,8 @@ import zio.json._ import zio.syntax._ object NodeStateEncoder { - implicit def enc(state: NodeState): String = state.name - implicit def dec(state: String): Either[Throwable, NodeState] = { + implicit def enc(state: NodeState): String = state.name + implicit def dec(state: String): Either[Throwable, NodeState] = { NodeState.values.find(state.toLowerCase() == _.name) match { case Some(s) => Right(s) case None => Left(new IllegalArgumentException(s"'${state}' can not be decoded to a NodeState")) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala index 86f0de569a0..d4fc34d4072 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala @@ -411,7 +411,7 @@ class GitActiveTechniqueCategoryArchiverImpl( with BuildCategoryPathName[ActiveTechniqueCategoryId] with GitArchiverFullCommitUtils { override def loggerName: String = this.getClass.getName - override lazy val relativePath = techniqueLibraryRootDir + override lazy val relativePath = techniqueLibraryRootDir override def getCategoryName(categoryId: ActiveTechniqueCategoryId) = categoryId.value override lazy val tagPrefix = "archives/directives/" @@ -663,7 +663,7 @@ class GitActiveTechniqueArchiverImpl( with BuildCategoryPathName[ActiveTechniqueCategoryId] { override def loggerName: String = this.getClass.getName - override lazy val relativePath = techniqueLibraryRootDir + override lazy val relativePath = techniqueLibraryRootDir override def getCategoryName(categoryId: ActiveTechniqueCategoryId) = categoryId.value private[this] def newActiveTechniqueFile(ptName: TechniqueName, parents: List[ActiveTechniqueCategoryId]) = { @@ -812,7 +812,7 @@ class GitDirectiveArchiverImpl( with BuildCategoryPathName[ActiveTechniqueCategoryId] { override def loggerName: String = this.getClass.getName - override lazy val relativePath = techniqueLibraryRootDir + override lazy val relativePath = techniqueLibraryRootDir override def getCategoryName(categoryId: ActiveTechniqueCategoryId) = categoryId.value private[this] def newPiFile( @@ -928,7 +928,7 @@ class GitNodeGroupArchiverImpl( with BuildCategoryPathName[NodeGroupCategoryId] with GitArchiverFullCommitUtils { override def loggerName: String = this.getClass.getName - override lazy val relativePath = groupLibraryRootDir + override lazy val relativePath = groupLibraryRootDir override def getCategoryName(categoryId: NodeGroupCategoryId) = categoryId.value override lazy val tagPrefix = "archives/groups/" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala index 257e6c84e95..7a63f64904d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala @@ -642,7 +642,7 @@ trait ArchiveMode extends Any { * To be counted as a directory the last character have to be a /. */ final case class PartialArchive(directory: String) extends AnyVal with ArchiveMode { - def configureRm(rmCmd: RmCommand): RmCommand = rmCmd.addFilepattern(directory) + def configureRm(rmCmd: RmCommand): RmCommand = rmCmd.addFilepattern(directory) def configureCheckout(coCmd: CheckoutCommand): CheckoutCommand = coCmd.addPath(directory) } @@ -657,7 +657,7 @@ object PartialArchive { import com.normation.rudder.repository.xml.PartialArchive._ case object TechniqueLibraryArchive extends ArchiveMode { - def configureRm(rmCmd: RmCommand): RmCommand = directiveArchive.configureRm(ncfArchive.configureRm(rmCmd)) + def configureRm(rmCmd: RmCommand): RmCommand = directiveArchive.configureRm(ncfArchive.configureRm(rmCmd)) def configureCheckout(coCmd: CheckoutCommand): CheckoutCommand = directiveArchive.configureCheckout(ncfArchive.configureCheckout(coCmd)) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala index 94349889c6e..be5e6d986d2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala @@ -127,7 +127,7 @@ trait PostNodeDeleteAction { // or zero (if only some things remain) // and if can optionnally have a nodeInfo def run(nodeId: NodeId, mode: DeleteMode, info: Option[CoreNodeFact], status: Set[InventoryStatus])(implicit - cc: ChangeContext + cc: ChangeContext ): UIO[Unit] } @@ -469,10 +469,10 @@ class RemoveNodeFromGroups( ) extends PostNodeDeleteAction { override def run( - nodeId: NodeId, - mode: DeleteMode, - info: Option[CoreNodeFact], - status: Set[InventoryStatus] + nodeId: NodeId, + mode: DeleteMode, + info: Option[CoreNodeFact], + status: Set[InventoryStatus] )(implicit cc: ChangeContext): UIO[Unit] = { (for { _ <- NodeLoggerPure.Delete.debug(s" - remove node ${nodeId.value} from his groups") @@ -504,10 +504,10 @@ class RemoveNodeFromGroups( */ class CloseNodeConfiguration(expectedReportsRepository: UpdateExpectedReportsRepository) extends PostNodeDeleteAction { override def run( - nodeId: NodeId, - mode: DeleteMode, - info: Option[CoreNodeFact], - status: Set[InventoryStatus] + nodeId: NodeId, + mode: DeleteMode, + info: Option[CoreNodeFact], + status: Set[InventoryStatus] )(implicit cc: ChangeContext): UIO[Unit] = { for { _ <- NodeLoggerPure.Delete.debug(s" - close expected reports for '${nodeId.value}'") @@ -523,10 +523,10 @@ class CloseNodeConfiguration(expectedReportsRepository: UpdateExpectedReportsRep // when the node is a policy server, delete directive/rule/group related to it class DeletePolicyServerPolicies(policyServerManagement: PolicyServerManagementService) extends PostNodeDeleteAction { override def run( - nodeId: NodeId, - mode: DeleteMode, - info: Option[CoreNodeFact], - status: Set[InventoryStatus] + nodeId: NodeId, + mode: DeleteMode, + info: Option[CoreNodeFact], + status: Set[InventoryStatus] )(implicit cc: ChangeContext): UIO[Unit] = { // we can avoid to do LDAP requests if we are sure the node wasn't a policy server info.map(_.rudderSettings.isPolicyServer) match { @@ -548,10 +548,10 @@ class DeletePolicyServerPolicies(policyServerManagement: PolicyServerManagementS // clean up certification key status (only in move mode, not erase) class ResetKeyStatus(ldap: LDAPConnectionProvider[RwLDAPConnection], deletedDit: InventoryDit) extends PostNodeDeleteAction { override def run( - nodeId: NodeId, - mode: DeleteMode, - info: Option[CoreNodeFact], - status: Set[InventoryStatus] + nodeId: NodeId, + mode: DeleteMode, + info: Option[CoreNodeFact], + status: Set[InventoryStatus] )(implicit cc: ChangeContext): UIO[Unit] = { if (mode == DeleteMode.MoveToRemoved) { NodeLoggerPure.Delete.debug(s" - reset node key certification status for '${nodeId.value}'") *> @@ -573,10 +573,10 @@ class ResetKeyStatus(ldap: LDAPConnectionProvider[RwLDAPConnection], deletedDit: // clean-up cfengine key - only possible if we still have an inventory class CleanUpCFKeys extends PostNodeDeleteAction { override def run( - nodeId: NodeId, - mode: DeleteMode, - info: Option[CoreNodeFact], - status: Set[InventoryStatus] + nodeId: NodeId, + mode: DeleteMode, + info: Option[CoreNodeFact], + status: Set[InventoryStatus] )(implicit cc: ChangeContext): UIO[Unit] = { info match { case Some(i) => @@ -636,10 +636,10 @@ class CleanUpNodePolicyFiles(varRudderShare: String) extends PostNodeDeleteActio import better.files.File._ override def run( - nodeId: NodeId, - mode: DeleteMode, - info: Option[CoreNodeFact], - status: Set[InventoryStatus] + nodeId: NodeId, + mode: DeleteMode, + info: Option[CoreNodeFact], + status: Set[InventoryStatus] )(implicit cc: ChangeContext): UIO[Unit] = { NodeLoggerPure.Delete.debug(s" - clean-up node '${nodeId.value}' policy files in /var/rudder/share") *> cleanPoliciesRec(nodeId, File(varRudderShare)).runDrain.catchAll(err => { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala index 38e2bae2129..f71e1c1cb86 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala @@ -192,7 +192,7 @@ class FileHistoryLogRepository[ID: ClassTag, T]( } object FileHistoryLogRepository { - private val formatter = ISODateTimeFormat.dateTime() + private val formatter = ISODateTimeFormat.dateTime() private def vToS(version: DateTime) = formatter.print(version) private def sToV(version: String): Option[DateTime] = { try { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala index b735f8cc44f..30ec917fdc4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala @@ -95,7 +95,7 @@ class FullInventoryFileParser( } object NodeIdConverter extends IdToFilenameConverter[NodeId] { - override def idToFilename(id: NodeId): String = id.value + override def idToFilename(id: NodeId): String = id.value override def filenameToId(name: String): NodeId = NodeId(name) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala index 26004711f12..62c0fa2877c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala @@ -179,18 +179,18 @@ object InterpolationContext { def apply( nodeInfo: NodeInfo, policyServerInfo: NodeInfo, - globalPolicyMode: GlobalPolicyMode, // environment variable for that server + globalPolicyMode: GlobalPolicyMode, // environment variable for that server // must be a case insensitive Map !!!! - nodeContext: Map[String, Variable], // parameters for this node + nodeContext: Map[String, Variable], // parameters for this node // must be a case SENSITIVE Map !!!! - parameters: Map[String, ConfigValue], // the depth of the interpolation context evaluation + parameters: Map[String, ConfigValue], // the depth of the interpolation context evaluation // used as a lazy, trivial, mostly broken way to detect cycle in interpretation // for ex: param a => param b => param c => ..... => param a // should not be evaluated - depth: Int = 0 + depth: Int = 0 ) = new InterpolationContext(nodeInfo, policyServerInfo, globalPolicyMode, TreeMap(nodeContext.toSeq: _*), parameters, depth) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala index 3060a718709..ccb0c507214 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala @@ -2028,7 +2028,7 @@ trait PromiseGeneration_Hooks extends PromiseGenerationService with PromiseGener */ def writeNodeIdsForHook(path: String, sortedNodeIds: SortedNodeIds, start: DateTime, end: DateTime): IOResult[Unit] = { // format of date in the file - def date(d: DateTime) = d.toString(ISODateTimeFormat.basicDateTime()) + def date(d: DateTime) = d.toString(ISODateTimeFormat.basicDateTime()) // how to format a list of ids in the file def formatIds(ids: Seq[String]) = "(" + ids.mkString("\n", "\n", "\n") + ")" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala index 4b113b3227e..480abc4c85f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala @@ -521,18 +521,18 @@ object PropertyParser { P(Start ~ ((noVariableStart | variable | ("${" ~ noVariableEnd.map(_.prefix("${")))).rep(1) | empty) ~ End).map(_.toList) // empty string is a special case that must be look appart from plain string. - def empty[A: P]: P[List[CharSeq]] = P("").map(_ => CharSeq("") :: Nil) - def space[A: P]: P[Unit] = P(CharsWhile(_.isWhitespace, 0)) + def empty[A: P]: P[List[CharSeq]] = P("").map(_ => CharSeq("") :: Nil) + def space[A: P]: P[Unit] = P(CharsWhile(_.isWhitespace, 0)) // plain string must not match our identifier, ${rudder.* and ${node.properties.*} // here we defined a function to build them def noVariableStart[A: P]: P[CharSeq] = P((!"${" ~ AnyChar).rep(1).!).map(CharSeq(_)) - def noVariableEnd[A: P]: P[CharSeq] = P((!"}" ~ AnyChar).rep(1).!).map(CharSeq(_)) + def noVariableEnd[A: P]: P[CharSeq] = P((!"}" ~ AnyChar).rep(1).!).map(CharSeq(_)) def variable[A: P]: P[Token] = P("${" ~ space ~ variableType ~ space ~ "}") def variableType[A: P]: P[Token] = P(interpolatedVariable | otherVariable) - def variableId[A: P]: P[String] = P(CharIn("""\-_a-zA-Z0-9""").rep(1).!) - def propertyId[A: P]: P[String] = P(CharsWhile(validPropertyNameChar).!) + def variableId[A: P]: P[String] = P(CharIn("""\-_a-zA-Z0-9""").rep(1).!) + def propertyId[A: P]: P[String] = P(CharsWhile(validPropertyNameChar).!) // other cases of ${}: cfengine variables, etc def otherVariable[A: P]: P[NonRudderVar] = P((variableId ~ ".").rep(0) ~ variableId).map { @@ -589,18 +589,18 @@ object PropertyParser { } } - def defaultOption[A: P]: P[DefaultValue] = P( + def defaultOption[A: P]: P[DefaultValue] = P( IgnoreCase("default") ~/ space ~ "=" ~/ space ~/ (P(string("\"") | string("\"\"\"") | emptyString | variable.map(_ :: Nil))) ).map(DefaultValue(_)) - def onNodeOption[A: P]: P[InterpreteOnNode.type] = P(IgnoreCase("node")).map(_ => InterpreteOnNode) + def onNodeOption[A: P]: P[InterpreteOnNode.type] = P(IgnoreCase("node")).map(_ => InterpreteOnNode) def emptyString[A: P]: P[List[Token]] = P("\"\"\"\"\"\"" | "\"\"").map(_ => CharSeq("") :: Nil) // string must be simple or triple quoted string - def string[A: P](quote: String): P[List[Token]] = P( + def string[A: P](quote: String): P[List[Token]] = P( quote ~ (noVariableStartString(quote) | variable | ("${" ~ noVariableEndString(quote)).map(_.prefix("${"))).rep(1) ~ quote ).map { case x => x.toList } - def noVariableStartString[A: P](quote: String): P[CharSeq] = P((!"${" ~ (!quote ~ AnyChar)).rep(1).!).map(CharSeq(_)) - def noVariableEndString[A: P](quote: String): P[CharSeq] = P((!"}" ~ (!quote ~ AnyChar)).rep(1).!).map(CharSeq(_)) + def noVariableStartString[A: P](quote: String): P[CharSeq] = P((!"${" ~ (!quote ~ AnyChar)).rep(1).!).map(CharSeq(_)) + def noVariableEndString[A: P](quote: String): P[CharSeq] = P((!"}" ~ (!quote ~ AnyChar)).rep(1).!).map(CharSeq(_)) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala index 42d1c094aed..8ac4cb74a95 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala @@ -91,9 +91,9 @@ abstract class ImplicitGetBytes { @HostAccess.Export class JsLibHash() extends ImplicitGetBytes { @HostAccess.Export - def md5(s: String): String = MD5.hash(s) + def md5(s: String): String = MD5.hash(s) @HostAccess.Export - def sha1(s: String): String = SHA1.hash(s) + def sha1(s: String): String = SHA1.hash(s) @HostAccess.Export def sha256(s: String): String = SHA256.hash(s) @HostAccess.Export @@ -106,14 +106,14 @@ trait JsLibPassword extends ImplicitGetBytes { /// Standard Unix (crypt) specific @HostAccess.Export - def cryptMd5(s: String): String = Md5Crypt.md5Crypt(s) + def cryptMd5(s: String): String = Md5Crypt.md5Crypt(s) @HostAccess.Export def cryptSha256(s: String): String = Sha2Crypt.sha256Crypt(s) @HostAccess.Export def cryptSha512(s: String): String = Sha2Crypt.sha512Crypt(s) @HostAccess.Export - def cryptMd5(s: String, salt: String): String = Md5Crypt.md5Crypt(s, salt) + def cryptMd5(s: String, salt: String): String = Md5Crypt.md5Crypt(s, salt) @HostAccess.Export def cryptSha256(s: String, salt: String): String = Sha2Crypt.sha256Crypt(s, "$5$" + salt) @HostAccess.Export @@ -122,14 +122,14 @@ trait JsLibPassword extends ImplicitGetBytes { /// Aix specific @HostAccess.Export - def aixMd5(s: String): String = AixPasswordHashAlgo.smd5(s) + def aixMd5(s: String): String = AixPasswordHashAlgo.smd5(s) @HostAccess.Export def aixSha256(s: String): String = AixPasswordHashAlgo.ssha256(s) @HostAccess.Export def aixSha512(s: String): String = AixPasswordHashAlgo.ssha512(s) @HostAccess.Export - def aixMd5(s: String, salt: String): String = AixPasswordHashAlgo.smd5(s, Some(salt)) + def aixMd5(s: String, salt: String): String = AixPasswordHashAlgo.smd5(s, Some(salt)) @HostAccess.Export def aixSha256(s: String, salt: String): String = AixPasswordHashAlgo.ssha256(s, Some(salt)) @HostAccess.Export @@ -284,14 +284,14 @@ final class JsRudderLibImpl( new JsLibPassword() { /// method accessible from JS @HostAccess.Export - def md5(s: String): String = super.cryptMd5(s) + def md5(s: String): String = super.cryptMd5(s) @HostAccess.Export def sha256(s: String): String = super.cryptSha256(s) @HostAccess.Export def sha512(s: String): String = super.cryptSha512(s) @HostAccess.Export - def md5(s: String, salt: String): String = super.cryptMd5(s, salt) + def md5(s: String, salt: String): String = super.cryptMd5(s, salt) @HostAccess.Export def sha256(s: String, salt: String): String = super.cryptSha256(s, salt) @HostAccess.Export @@ -302,14 +302,14 @@ final class JsRudderLibImpl( new JsLibPassword() { /// method accessible from JS @HostAccess.Export - def md5(s: String): String = super.aixMd5(s) + def md5(s: String): String = super.aixMd5(s) @HostAccess.Export def sha256(s: String): String = super.aixSha256(s) @HostAccess.Export def sha512(s: String): String = super.aixSha512(s) @HostAccess.Export - def md5(s: String, salt: String): String = super.aixMd5(s, salt) + def md5(s: String, salt: String): String = super.aixMd5(s, salt) @HostAccess.Export def sha256(s: String, salt: String): String = super.aixSha256(s, salt) @HostAccess.Export @@ -328,11 +328,11 @@ final class JsRudderLibImpl( ("hash", hash) ) - override def getMember(key: String): AnyRef = + override def getMember(key: String): AnyRef = members.get(key).getOrElse(s"Requested access to unknown member '${key}' in JS proxy object") - override def getMemberKeys: AnyRef = members.keys.toArray - override def hasMember(key: String): Boolean = members.isDefinedAt(key) - override def putMember(key: String, value: Value): Unit = () + override def getMemberKeys: AnyRef = members.keys.toArray + override def hasMember(key: String): Boolean = members.isDefinedAt(key) + override def putMember(key: String, value: Value): Unit = () } sealed trait JsRudderLibBinding { @@ -390,7 +390,7 @@ object JsEngineProvider { * */ def withNewEngine[T](feature: FeatureSwitch, maxThread: Int = 1, timeout: FiniteDuration)( - script: JsEngine => IOResult[T] + script: JsEngine => IOResult[T] ): IOResult[T] = { feature match { case FeatureSwitch.Enabled => @@ -528,7 +528,7 @@ object JsEngine { * So you should minimize the number of time it is done. */ def sandboxed[T](maxThread: Int = 1, timeout: FiniteDuration = DEFAULT_MAX_EVAL_DURATION)( - script: SandboxedJsEngine => IOResult[T] + script: SandboxedJsEngine => IOResult[T] ): IOResult[T] = { final case class ManagedJsEnv(pool: ExecutorService, engine: SandboxedJsEngine) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala index 84d19642cda..83d416293bb 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala @@ -162,7 +162,7 @@ class AgentRegister { */ def traverseMap[T]( agentNodeProps: AgentNodeProperties - )(default: () => Box[List[T]], f: AgentSpecificGeneration => Box[List[T]]): Box[List[T]] = { + )(default: () => Box[List[T]], f: AgentSpecificGeneration => Box[List[T]]): Box[List[T]] = { (traverse(pipeline) { handler => if (handler.handle(agentNodeProps)) { f(handler) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala index eea29c988f2..02b26dca100 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala @@ -355,7 +355,7 @@ class BuildBundleSequence( agentType: AgentType, globalPolicyMode: GlobalPolicyMode, nodePolicyMode: Option[PolicyMode] - )(policy: Policy): PureResult[TechniqueBundles] = { + )(policy: Policy): PureResult[TechniqueBundles] = { // naming things to make them clear val name = Promiser(policy.ruleName + "/" + policy.directiveName) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala index 9550bbc1fbf..05b8a4c474c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala @@ -340,7 +340,7 @@ class PolicyWriterServiceImpl( */ def parallelSequence[U, T]( seq: Seq[U] - )(f: U => IOResult[T])(implicit timeout: Duration, maxParallelism: Int): IOResult[Seq[T]] = { + )(f: U => IOResult[T])(implicit timeout: Duration, maxParallelism: Int): IOResult[Seq[T]] = { (seq .accumulateParN(maxParallelism)(f)) .timeoutFail( @@ -351,7 +351,7 @@ class PolicyWriterServiceImpl( // a version for Hook with a nicer message accumulation def parallelSequenceNodeHook( seq: Seq[AgentNodeConfiguration] - )(f: AgentNodeConfiguration => IOResult[HookReturnCode])(implicit timeout: Duration, maxParallelism: Int): IOResult[Unit] = { + )(f: AgentNodeConfiguration => IOResult[HookReturnCode])(implicit timeout: Duration, maxParallelism: Int): IOResult[Unit] = { // a dedicated error for hooks final case class HookError(nodeId: NodeId, errorCode: HookReturnCode.Error) extends RudderError { @@ -724,9 +724,9 @@ class PolicyWriterServiceImpl( * Note: just making traverse for prepared technique/writePromisesFiles parallel increase latency by x5 */ private[this] def writePolicies( - preparedTemplates: Seq[AgentNodeWritableConfiguration], - writeTimer: WriteTimer, - fillTimer: FillTemplateTimer + preparedTemplates: Seq[AgentNodeWritableConfiguration], + writeTimer: WriteTimer, + fillTimer: FillTemplateTimer )(implicit maxParallelism: Int, timeout: Duration): IOResult[Unit] = { /* * Idea: sort template by content (ie what is cached). Put each unique cache in a seq with the corresponding list of @@ -809,7 +809,7 @@ class PolicyWriterServiceImpl( writeTimer: WriteTimer, globalPolicyMode: GlobalPolicyMode, resources: Map[(TechniqueResourceId, AgentType), TechniqueResourceCopyInfo] - )(implicit timeout: Duration, maxParallelism: Int): IOResult[Unit] = { + )(implicit timeout: Duration, maxParallelism: Int): IOResult[Unit] = { parallelSequence(preparedTemplates) { prepared => val isRootServer = prepared.agentNodeProps.nodeId == Constants.ROOT_POLICY_SERVER_ID val writeResources = ZIO.foreachDiscard(prepared.preparedTechniques) { preparedTechnique => diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala index 58f27d72502..404559d5163 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala @@ -181,8 +181,8 @@ trait JsonQueryLexer extends QueryLexer { Failure("Parsing failed when processing query: " + s, Full(e), Empty) } - def failureMissing(s: String): Failure = Failure("Missing expected '%s' query parameter".format(s)) - def failureEmpty(param: String): Failure = Failure("Parameter '%s' must be non empty in query".format(OBJECT)) + def failureMissing(s: String): Failure = Failure("Missing expected '%s' query parameter".format(s)) + def failureEmpty(param: String): Failure = Failure("Parameter '%s' must be non empty in query".format(OBJECT)) def failureBadFormat(obj: String, f: Any): Failure = Failure( "Bad query format for '%s' parameter. Expecting a string, found '%s'".format(obj, f) ) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala index 74ca7cc1beb..992a033f9ee 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala @@ -122,11 +122,11 @@ class NodeFactQueryProcessor( status: InventoryStatus = AcceptedInventory ) extends QueryProcessor with QueryChecker { - def process(query: Query): Box[Seq[NodeId]] = processPure(query).map(_.toList.map(_.id)).toBox + def process(query: Query): Box[Seq[NodeId]] = processPure(query).map(_.toList.map(_.id)).toBox def processOnlyId(query: Query): Box[Seq[NodeId]] = processPure(query).map(_.toList.map(_.id)).toBox - def check(query: Query, nodeIds: Option[Seq[NodeId]])(implicit qc: QueryContext): IOResult[Set[NodeId]] = { ??? } - def processPure(query: Query): IOResult[Chunk[CoreNodeFact]] = { + def check(query: Query, nodeIds: Option[Seq[NodeId]])(implicit qc: QueryContext): IOResult[Set[NodeId]] = { ??? } + def processPure(query: Query): IOResult[Chunk[CoreNodeFact]] = { def process(s: SelectNodeStatus) = { for { t0 <- currentTimeMillis diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala index 74d5cca5b8a..a5b16f2073a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala @@ -115,8 +115,8 @@ object QSNodeFactBackend extends Loggable { private[this] def toMatch(node: CoreNodeFact): Option[Set[(String, String)]] = { - def someSet(v: String) = Some(Set((v, v))) - def optSet(v: Option[String]) = v.map(x => Set((x, x))) + def someSet(v: String) = Some(Set((v, v))) + def optSet(v: Option[String]) = v.map(x => Set((x, x))) /* * A set of value to check against / value to return to the user @@ -310,8 +310,8 @@ object QSLdapBackend { * The actual search logic, everything else is just glue to make it works. */ def search(query: Query)(implicit - ldap: LDAPConnectionProvider[RoLDAPConnection], - rudderDit: RudderDit + ldap: LDAPConnectionProvider[RoLDAPConnection], + rudderDit: RudderDit ): IOResult[Seq[QuickSearchResult]] = { // the filter for attribute and for attributes must be non empty, else return nothing val ocFilter = query.objectClass.map(_.filter).flatten.toSeq @@ -525,15 +525,15 @@ object QSLdapBackend { a match { case Tags => - def matcher(t: Tag) = pattern.matcher(t.name.value).matches || pattern.matcher(t.value.value).matches + def matcher(t: Tag) = pattern.matcher(t.name.value).matches || pattern.matcher(t.value.value).matches def transform(tag: Tag) = s"${tag.name.value}=${tag.value.value}" parseTag(value, matcher, transform) case TagKeys => - def matcher(t: Tag) = pattern.matcher(t.name.value).matches + def matcher(t: Tag) = pattern.matcher(t.name.value).matches def transform(tag: Tag) = tag.name.value parseTag(value, matcher, transform) case TagValues => - def matcher(t: Tag) = pattern.matcher(t.value.value).matches + def matcher(t: Tag) = pattern.matcher(t.value.value).matches def transform(tag: Tag) = tag.value.value parseTag(value, matcher, transform) @@ -547,7 +547,7 @@ object QSLdapBackend { * Build LDAP filter for a QSObject */ implicit final class QSObjectLDAPFilter(obj: QSObject)(implicit - rudderDit: RudderDit + rudderDit: RudderDit ) { def filter: List[Filter] = obj match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala index 2cf67565da8..c141658c883 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala @@ -76,7 +76,7 @@ object QSBackend { * parameter */ sealed trait QSAttribute { - def name: String + def name: String def display: String = name.capitalize.replace("_", " ") } object QSAttribute { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala index 1a4139b6a57..de7f638e98b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala @@ -179,13 +179,13 @@ object QSRegexQueryParser { ///// // deal with filters: they all start with "in:" - private[this] def filter[A: P]: P[Filter] = P(filterAttr | filterType) + private[this] def filter[A: P]: P[Filter] = P(filterAttr | filterType) private[this] def filterType[A: P]: P[Filter] = P(IgnoreCase("is:") ~ filterKeys) map { FilterType } private[this] def filterAttr[A: P]: P[Filter] = P(IgnoreCase("in:") ~ filterKeys) map { FilterAttr } // the keys part private[this] def filterKeys[A: P]: P[Set[String]] = P(filterKey.rep(sep = ",")) map { l => l.toSet } - private[this] def filterKey[A: P]: P[String] = P(CharsWhileIn("""\\-._a-zA-Z0-9""").!) + private[this] def filterKey[A: P]: P[String] = P(CharsWhileIn("""\\-._a-zA-Z0-9""").!) ///// ///// simple elements: query string @@ -193,7 +193,7 @@ object QSRegexQueryParser { // we need to case, because regex are bad to look-ahead and see if there is still filter after. .+? necessary to stop at first filter private[this] def queryInMiddle[A: P]: P[QueryString] = P((!("in:" | "is:") ~ AnyChar).rep(1).!) map { x => CharSeq(x.trim) } - private[this] def queryAtEnd[A: P]: P[QueryString] = P(AnyChar.rep(1).!) map { x => CharSeq(x.trim) } + private[this] def queryAtEnd[A: P]: P[QueryString] = P(AnyChar.rep(1).!) map { x => CharSeq(x.trim) } ///// ///// utility methods diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala index 43fa6725ef4..6cb9121034e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala @@ -104,12 +104,12 @@ object QuickSearchService { } implicit class QSBackendImpl(b: QSBackend)(implicit - directiveRepo: RoDirectiveRepository, - ldap: LDAPConnectionProvider[RoLDAPConnection], - inventoryDit: InventoryDit, - nodeDit: NodeDit, - rudderDit: RudderDit, - nodeFactRepo: NodeFactRepository + directiveRepo: RoDirectiveRepository, + ldap: LDAPConnectionProvider[RoLDAPConnection], + inventoryDit: InventoryDit, + nodeDit: NodeDit, + rudderDit: RudderDit, + nodeFactRepo: NodeFactRepository ) { import QSBackend._ diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala index 577a49cb326..eff56e2f501 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala @@ -407,7 +407,7 @@ object ExecutionBatch extends Loggable { // If exists, the last run received for these nodes is coupled with the // corresponding expected node configuration for that run, which will allow to know what // config option to apply. - runs: Map[NodeId, Option[AgentRunWithNodeConfig]], // the current expected node configurations for all nodes. + runs: Map[NodeId, Option[AgentRunWithNodeConfig]], // the current expected node configurations for all nodes. // This is useful for nodes without runs (ex in no-report mode), node with a run not for the // last config (show diff etc). It may be none for ex. when a node was added since last generation @@ -735,7 +735,7 @@ object ExecutionBatch extends Loggable { * It returns a properly merged NodeStatusReports */ def getNodeStatusReports( - nodeId: NodeId, // run info: if we have a run, we have a datetime for it + nodeId: NodeId, // run info: if we have a run, we have a datetime for it // and perhaps a configId runInfo: RunAndConfigInfo, // reports we get on the last know run @@ -980,7 +980,7 @@ object ExecutionBatch extends Loggable { } private[reports] def getComplianceForRule( - mergeInfo: MergeInfo, // only report for that ruleId, for that nodeid, of type ResultReports, + mergeInfo: MergeInfo, // only report for that ruleId, for that nodeid, of type ResultReports, // for the correct run, for the correct version reportsForThatNodeRule: Seq[ResultReports], @@ -1120,7 +1120,7 @@ object ExecutionBatch extends Loggable { * */ private[reports] def getComplianceForRun( - mergeInfo: MergeInfo, // only report for that nodeid, of type ResultReports, + mergeInfo: MergeInfo, // only report for that nodeid, of type ResultReports, // for the correct run, for the correct version executionReports: Seq[ResultReports], @@ -1200,7 +1200,7 @@ object ExecutionBatch extends Loggable { * to the "serial" of rule. */ private[reports] def mergeCompareByRule( - mergeInfo: MergeInfo, // only report for that nodeid, of type ResultReports, + mergeInfo: MergeInfo, // only report for that nodeid, of type ResultReports, // for the correct run, for the correct version executionReports: Seq[ResultReports], diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingService.scala index 42a5d172740..32a7636e111 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingService.scala @@ -59,13 +59,13 @@ trait ReportingService { * find node status reports for all rules) */ def findRuleNodeStatusReports(nodeIds: Set[NodeId], filterByRules: Set[RuleId])(implicit - qc: QueryContext + qc: QueryContext ): Box[Map[NodeId, NodeStatusReport]] def findDirectiveNodeStatusReports( nodeIds: Set[NodeId], filterByDirectives: Set[DirectiveId] - )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] + )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] def findUncomputedNodeStatusReports(): Box[Map[NodeId, NodeStatusReport]] @@ -75,7 +75,7 @@ trait ReportingService { * find node status reports for all rules) */ def findRuleNodeCompliance(nodeIds: Set[NodeId], filterByRules: Set[RuleId])(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, ComplianceLevel]] /** @@ -87,7 +87,7 @@ trait ReportingService { nodeIds: Set[NodeId], filterBySystemRules: Set[RuleId], filterByUserRules: Set[RuleId] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] /** * A specialised version of `findRuleNodeStatusReports` to find node status reports for a given rule. @@ -121,7 +121,7 @@ trait ReportingService { */ def getSystemAndUserCompliance( optNodeIds: Option[Set[NodeId]] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] /** * * Get the global compliance for reports passed in parameters diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala index 2bca9b8f751..4ce26187e99 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala @@ -72,7 +72,7 @@ import zio.syntax._ object ReportingServiceUtils { def log(msg: String): ZIO[Any, Nothing, Unit] = ZIO.succeed(println(msg)) // you actual log lib - val effect: Task[Nothing] = ZIO.attempt( + val effect: Task[Nothing] = ZIO.attempt( throw new RuntimeException("I'm some impure code!") ) // here, exception is caught and you get a ZIO[Any, Throwable, Something] val withLogError: ZIO[Any, Throwable, Nothing] = @@ -177,7 +177,7 @@ trait RuleOrNodeReportingServiceImpl extends ReportingService { def rulesRepo: RoRuleRepository override def findDirectiveRuleStatusReportsByRule( - ruleId: RuleId + ruleId: RuleId )(implicit qc: QueryContext): IOResult[Map[NodeId, NodeStatusReport]] = { // here, the logic is ONLY to get the node for which that rule applies and then step back // on the other method @@ -196,7 +196,7 @@ trait RuleOrNodeReportingServiceImpl extends ReportingService { override def findStatusReportsForDirective( directiveId: DirectiveId - )(implicit qc: QueryContext): IOResult[Map[NodeId, NodeStatusReport]] = { + )(implicit qc: QueryContext): IOResult[Map[NodeId, NodeStatusReport]] = { // here, the logic is ONLY to get the node for which that rule applies and then step back // on the other method for { @@ -285,7 +285,7 @@ trait RuleOrNodeReportingServiceImpl extends ReportingService { def getSystemAndUserCompliance( optNodeIds: Option[Set[NodeId]] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = { + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = { for { n1 <- currentTimeMillis nodeIds <- optNodeIds match { @@ -567,7 +567,7 @@ trait CachedFindRuleNodeStatusReports */ private[this] def checkAndGetCache( nodeIdsToCheck: Set[NodeId] - )(implicit qc: QueryContext): IOResult[Map[NodeId, NodeStatusReport]] = { + )(implicit qc: QueryContext): IOResult[Map[NodeId, NodeStatusReport]] = { if (nodeIdsToCheck.isEmpty) { Map[NodeId, NodeStatusReport]().succeed } else { @@ -637,7 +637,7 @@ trait CachedFindRuleNodeStatusReports * That method nonetheless check for expiration dates. */ override def findRuleNodeStatusReports(nodeIds: Set[NodeId], ruleIds: Set[RuleId])(implicit - qc: QueryContext + qc: QueryContext ): Box[Map[NodeId, NodeStatusReport]] = { val n1 = System.currentTimeMillis for { @@ -658,7 +658,7 @@ trait CachedFindRuleNodeStatusReports override def findDirectiveNodeStatusReports( nodeIds: Set[NodeId], directiveIds: Set[DirectiveId] - )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = { + )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = { val n1 = System.currentTimeMillis for { reports <- checkAndGetCache(nodeIds).toBox @@ -677,7 +677,7 @@ trait CachedFindRuleNodeStatusReports override def findRuleNodeCompliance( nodeIds: Set[NodeId], filterByRules: Set[RuleId] - )(implicit qc: QueryContext): IOResult[Map[NodeId, ComplianceLevel]] = { + )(implicit qc: QueryContext): IOResult[Map[NodeId, ComplianceLevel]] = { for { n1 <- currentTimeMillis reports <- checkAndGetCache(nodeIds) @@ -699,7 +699,7 @@ trait CachedFindRuleNodeStatusReports nodeIds: Set[NodeId], filterBySystemRules: Set[RuleId], filterByUserRules: Set[RuleId] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = { + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = { for { n1 <- currentTimeMillis reports <- checkAndGetCache(nodeIds) @@ -751,7 +751,7 @@ trait DefaultFindRuleNodeStatusReports extends ReportingService { def jdbcMaxBatchSize: Int override def findRuleNodeStatusReports(nodeIds: Set[NodeId], ruleIds: Set[RuleId])(implicit - qc: QueryContext + qc: QueryContext ): Box[Map[NodeId, NodeStatusReport]] = { /* * This is the main logic point to get reports. @@ -804,7 +804,7 @@ trait DefaultFindRuleNodeStatusReports extends ReportingService { override def findDirectiveNodeStatusReports( nodeIds: Set[NodeId], directiveIds: Set[DirectiveId] - )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = { + )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = { /* * This is the main logic point to get reports. * @@ -856,7 +856,7 @@ trait DefaultFindRuleNodeStatusReports extends ReportingService { override def findRuleNodeCompliance( nodeIds: Set[NodeId], filterByRules: Set[RuleId] - )(implicit qc: QueryContext): IOResult[Map[NodeId, ComplianceLevel]] = { + )(implicit qc: QueryContext): IOResult[Map[NodeId, ComplianceLevel]] = { for { t0 <- currentTimeMillis complianceMode <- getGlobalComplianceMode().toIO @@ -880,7 +880,7 @@ trait DefaultFindRuleNodeStatusReports extends ReportingService { nodeIds: Set[NodeId], filterBySystemRules: Set[RuleId], filterByUserRules: Set[RuleId] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = { + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = { for { t0 <- currentTimeMillis complianceMode <- getGlobalComplianceMode().toIO diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala index 807c598e674..01a9ea68aea 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala @@ -472,7 +472,7 @@ class PolicyServerManagementServiceImpl( Inconsistency("Root server configuration elements can't be deleted").fail } else { // we don't have specific validation to do: if the node is not a policy server, nothing will be done def DN(child: String, parentDN: DN) = new DN(child + "," + parentDN.toString) - val id = policyServerId.value + val id = policyServerId.value for { con <- ldap diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala index 604fe7ebbaf..577b626cb2a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala @@ -209,49 +209,49 @@ class CommitAndDeployChangeRequestServiceImpl( implicit val changeRequestId = changeRequest.id.value final case object CheckRule extends CheckChanges[Rule] { - def failureMessage(rule: Rule) = s"Rule ${rule.name} (id: ${rule.id.serialize})" - def getCurrentValue(rule: Rule) = roRuleRepository.get(rule.id).toBox + def failureMessage(rule: Rule) = s"Rule ${rule.name} (id: ${rule.id.serialize})" + def getCurrentValue(rule: Rule) = roRuleRepository.get(rule.id).toBox def compareMethod(initial: Rule, current: Rule) = CheckDivergenceForMerge.compareRules(initial, current) - def xmlSerialize(rule: Rule): Box[Node] = Full(xmlSerializer.rule.serialise(rule)) - def xmlUnserialize(xml: Node) = xmlUnserializer.rule.unserialise(xml) + def xmlSerialize(rule: Rule): Box[Node] = Full(xmlSerializer.rule.serialise(rule)) + def xmlUnserialize(xml: Node) = xmlUnserializer.rule.unserialise(xml) } // For now we only check the Directive, not the SectionSpec and the TechniqueName. // The SectionSpec could be a problem (ie : A mono valued param was changed to multi valued without changing the technique version). final case class CheckDirective(changes: DirectiveChanges) extends CheckChanges[Directive] { // used in serialisation - val directiveContext = { + val directiveContext = { // Option is None, if this is a Directive creation, but serialisation won't be used in this case (see check method) changes.changes.initialState match { case Some((techniqueName, _, rootSection)) => Full((techniqueName, rootSection)) case None => Failure("could not find directive context from initial state") } } - def failureMessage(directive: Directive) = s"Directive ${directive.name} (id: ${directive.id.serialize})" - def getCurrentValue(directive: Directive) = roDirectiveRepo.getDirective(directive.id.uid).toBox.flatMap { + def failureMessage(directive: Directive) = s"Directive ${directive.name} (id: ${directive.id.serialize})" + def getCurrentValue(directive: Directive) = roDirectiveRepo.getDirective(directive.id.uid).toBox.flatMap { case None => Empty case Some(dir) => Full(dir) } def compareMethod(initial: Directive, current: Directive) = CheckDivergenceForMerge.compareDirectives(initial, current) - def xmlSerialize(directive: Directive) = { + def xmlSerialize(directive: Directive) = { directiveContext.map { case (techniqueName, rootSection) => xmlSerializer.directive.serialise(techniqueName, rootSection, directive) } } - def xmlUnserialize(xml: Node) = xmlUnserializer.directive.unserialise(xml).map(_._2) + def xmlUnserialize(xml: Node) = xmlUnserializer.directive.unserialise(xml).map(_._2) } case object CheckGroup extends CheckChanges[NodeGroup] { - def failureMessage(group: NodeGroup) = s"Group ${group.name} (id: ${group.id.serialize})" - def getCurrentValue(group: NodeGroup) = roNodeGroupRepo.getNodeGroup(group.id).map(_._1).toBox + def failureMessage(group: NodeGroup) = s"Group ${group.name} (id: ${group.id.serialize})" + def getCurrentValue(group: NodeGroup) = roNodeGroupRepo.getNodeGroup(group.id).map(_._1).toBox def compareMethod(initial: NodeGroup, current: NodeGroup) = CheckDivergenceForMerge.compareGroups(initial, current) - def xmlSerialize(group: NodeGroup): Box[Node] = Full(xmlSerializer.group.serialise(group)) - def xmlUnserialize(xml: Node) = xmlUnserializer.group.unserialise(xml) + def xmlSerialize(group: NodeGroup): Box[Node] = Full(xmlSerializer.group.serialise(group)) + def xmlUnserialize(xml: Node) = xmlUnserializer.group.unserialise(xml) } case object CheckGlobalParameter extends CheckChanges[GlobalParameter] { - def failureMessage(param: GlobalParameter) = s"Parameter ${param.name}" + def failureMessage(param: GlobalParameter) = s"Parameter ${param.name}" def getCurrentValue(param: GlobalParameter) = roParameterRepository.getGlobalParameter(param.name).notOptional(s"Parameter '${param.name}' was not found").toBox def compareMethod(initial: GlobalParameter, current: GlobalParameter) = diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala index db5ed852ffa..9adead6d8c5 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala @@ -55,7 +55,7 @@ class SectionTest extends Specification { .asInstanceOf[ch.qos.logback.classic.Logger] .setLevel(ch.qos.logback.classic.Level.OFF) - val doc: Elem = readFile("testSections.xml") + val doc: Elem = readFile("testSections.xml") def sectionsTag(example: String): Node = (doc \\ "examples" \ example \ "SECTIONS").head val sectionSpecParser = new SectionSpecParser(new VariableSpecParser) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala index 35d63c65917..d0ae4df2b27 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala @@ -119,10 +119,10 @@ class DummyTechniqueRepository(policies: Seq[Technique] = Seq()) extends Techniq def this() = this(Seq()) // Spring need that... - override def getMetadataContent[T](techniqueId: TechniqueId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? - override def getTemplateContent[T](id: TechniqueResourceId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? - override def getFileContent[T](id: TechniqueResourceId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? - override def getAll(): Map[TechniqueId, Technique] = { policyMap } + override def getMetadataContent[T](techniqueId: TechniqueId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? + override def getTemplateContent[T](id: TechniqueResourceId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? + override def getFileContent[T](id: TechniqueResourceId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? + override def getAll(): Map[TechniqueId, Technique] = { policyMap } override def get(policyName: TechniqueId): Option[Technique] = { policyMap.get(policyName) @@ -142,9 +142,9 @@ class DummyTechniqueRepository(policies: Seq[Technique] = Seq()) extends Techniq override def getTechniqueVersions(name: TechniqueName): SortedSet[TechniqueVersion] = SortedSet.empty[TechniqueVersion] - override def getTechniqueLibrary: RootTechniqueCategory = null - override def getTechniqueCategory(id: TechniqueCategoryId): IOResult[TechniqueCategory] = null - override def getParentTechniqueCategory_forTechnique(id: TechniqueId): IOResult[TechniqueCategory] = null + override def getTechniqueLibrary: RootTechniqueCategory = null + override def getTechniqueCategory(id: TechniqueCategoryId): IOResult[TechniqueCategory] = null + override def getParentTechniqueCategory_forTechnique(id: TechniqueId): IOResult[TechniqueCategory] = null override def getAllCategories: Map[TechniqueCategoryId, TechniqueCategory] = ??? } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala index 5d3256b7513..e30f62c3941 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala @@ -102,8 +102,8 @@ class JGitRepositoryTest extends Specification with Loggable with AfterAll { override def xmlPrettyPrinter = new RudderPrettyPrinter(Int.MaxValue, 2) override def encoding: String = "UTF-8" override def gitModificationRepository: GitModificationRepository = new GitModificationRepository { - override def getCommits(modificationId: ModificationId): IOResult[Option[GitCommitId]] = None.succeed - override def addCommit(commit: GitCommitId, modId: ModificationId): IOResult[DB.GitCommitJoin] = + override def getCommits(modificationId: ModificationId): IOResult[Option[GitCommitId]] = None.succeed + override def addCommit(commit: GitCommitId, modId: ModificationId): IOResult[DB.GitCommitJoin] = DB.GitCommitJoin(commit, modId).succeed } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala index 242d960c1b0..6bd7a561368 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala @@ -160,27 +160,27 @@ class TechniqueRepositoryTest extends Specification with Loggable with AfterAll ActiveTechnique(ActiveTechniqueId("empty"), techniqueName, Map()).succeed } // ALL the following methods are useless for our test - override def getFullDirectiveLibrary(): IOResult[FullActiveTechniqueCategory] = + override def getFullDirectiveLibrary(): IOResult[FullActiveTechniqueCategory] = FullActiveTechniqueCategory(ActiveTechniqueCategoryId("Active Techniques"), "", "", Nil, Nil, true).succeed - override def getDirective(directiveId: DirectiveUid): IOResult[Option[Directive]] = ??? - override def getDirectiveWithContext(directiveId: DirectiveUid): IOResult[Option[(Technique, ActiveTechnique, Directive)]] = + override def getDirective(directiveId: DirectiveUid): IOResult[Option[Directive]] = ??? + override def getDirectiveWithContext(directiveId: DirectiveUid): IOResult[Option[(Technique, ActiveTechnique, Directive)]] = ??? - override def getActiveTechniqueAndDirective(id: DirectiveId): IOResult[Option[(ActiveTechnique, Directive)]] = ??? - override def getDirectives(activeTechniqueId: ActiveTechniqueId, includeSystem: Boolean): IOResult[Seq[Directive]] = ??? + override def getActiveTechniqueAndDirective(id: DirectiveId): IOResult[Option[(ActiveTechnique, Directive)]] = ??? + override def getDirectives(activeTechniqueId: ActiveTechniqueId, includeSystem: Boolean): IOResult[Seq[Directive]] = ??? override def getActiveTechniqueByCategory( includeSystem: Boolean ): IOResult[SortedMap[List[ActiveTechniqueCategoryId], CategoryWithActiveTechniques]] = ??? - override def getActiveTechniqueByActiveTechnique(id: ActiveTechniqueId): IOResult[Option[ActiveTechnique]] = ??? - override def getActiveTechnique(techniqueName: TechniqueName): IOResult[Option[ActiveTechnique]] = ??? - override def activeTechniqueBreadCrump(id: ActiveTechniqueId): IOResult[List[ActiveTechniqueCategory]] = ??? - override def getActiveTechniqueLibrary: IOResult[ActiveTechniqueCategory] = ??? - override def getAllActiveTechniqueCategories(includeSystem: Boolean): IOResult[Seq[ActiveTechniqueCategory]] = ??? - override def getActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[Option[ActiveTechniqueCategory]] = ??? - override def getParentActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[ActiveTechniqueCategory] = ??? - override def getParentsForActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[List[ActiveTechniqueCategory]] = + override def getActiveTechniqueByActiveTechnique(id: ActiveTechniqueId): IOResult[Option[ActiveTechnique]] = ??? + override def getActiveTechnique(techniqueName: TechniqueName): IOResult[Option[ActiveTechnique]] = ??? + override def activeTechniqueBreadCrump(id: ActiveTechniqueId): IOResult[List[ActiveTechniqueCategory]] = ??? + override def getActiveTechniqueLibrary: IOResult[ActiveTechniqueCategory] = ??? + override def getAllActiveTechniqueCategories(includeSystem: Boolean): IOResult[Seq[ActiveTechniqueCategory]] = ??? + override def getActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[Option[ActiveTechniqueCategory]] = ??? + override def getParentActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[ActiveTechniqueCategory] = ??? + override def getParentsForActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[List[ActiveTechniqueCategory]] = ??? - override def getParentsForActiveTechnique(id: ActiveTechniqueId): IOResult[ActiveTechniqueCategory] = ??? - override def containsDirective(id: ActiveTechniqueCategoryId): UIO[Boolean] = ??? + override def getParentsForActiveTechnique(id: ActiveTechniqueId): IOResult[ActiveTechniqueCategory] = ??? + override def containsDirective(id: ActiveTechniqueCategoryId): UIO[Boolean] = ??? override def saveActiveTechniqueCategory( category: ActiveTechniqueCategory, modificationId: ModificationId, diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala index 04b9bd8374a..9c1e2daa260 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala @@ -57,7 +57,7 @@ class TestXmlUtils { def child_A(child: Node): Elem = {child} def child_B(child: Node): Elem = {child} - val child_C: Elem = + val child_C: Elem = val sub_A: Node = val sub_B: Node = diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala index eaee81927e7..3fc0685ae1f 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala @@ -302,8 +302,8 @@ class MockTechniques(configurationRepositoryRoot: File, mockGit: MockGitConfigRe ).succeed override def getPolicyServers(): IOResult[PolicyServers] = ??? - override def savePolicyServers(policyServers: PolicyServers): IOResult[PolicyServers] = ??? - override def getAllAllowedNetworks(): IOResult[Map[NodeId, List[AllowedNetwork]]] = ??? + override def savePolicyServers(policyServers: PolicyServers): IOResult[PolicyServers] = ??? + override def getAllAllowedNetworks(): IOResult[Map[NodeId, List[AllowedNetwork]]] = ??? override def updatePolicyServers( commands: List[PolicyServersUpdateCommand], modId: ModificationId, @@ -322,7 +322,7 @@ class MockTechniques(configurationRepositoryRoot: File, mockGit: MockGitConfigRe modId: ModificationId, actor: EventActor ): IOResult[List[AllowedNetwork]] = ??? - override def deleteRelaySystemObjects(policyServerId: NodeId): IOResult[Unit] = ??? + override def deleteRelaySystemObjects(policyServerId: NodeId): IOResult[Unit] = ??? } val systemVariableService = new SystemVariableServiceImpl( @@ -2879,7 +2879,7 @@ class MockNodeGroups(nodesRepo: MockNodes) { class MockLdapQueryParsing(mockGit: MockGitConfigRepo, mockNodeGroups: MockNodeGroups) { ///// query parsing //// def DN(rdn: String, parent: DN) = new DN(new RDN(rdn), parent) - val LDAP_BASEDN = new DN("cn=rudder-configuration") + val LDAP_BASEDN = new DN("cn=rudder-configuration") val LDAP_INVENTORIES_BASEDN: DN = DN("ou=Inventories", LDAP_BASEDN) val LDAP_INVENTORIES_SOFTWARE_BASEDN = LDAP_INVENTORIES_BASEDN @@ -2914,7 +2914,7 @@ class MockLdapQueryParsing(mockGit: MockGitConfigRepo, mockNodeGroups: MockNodeG new NodeGroupCategoryUnserialisationImpl(), new NodeGroupUnserialisationImpl(new CmdbQueryParser { override def parse(query: StringQuery): Box[Query] = ??? - override def lex(query: String): Box[StringQuery] = ??? + override def lex(query: String): Box[StringQuery] = ??? }), mockGit.gitRepo, xmlEntityMigration, diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala index 1fc21d8f05f..77e18253a6e 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala @@ -105,8 +105,8 @@ class TestSaveInventoryGit extends TestSaveInventory { def acceptedNodeGitFile(id: String): File = File(GIT_ACCEPTED + "/" + id + ".json") - override def checkPendingNodeExists(id: String): Boolean = pendingNodeGitFile(id).exists - override def getPendingNodeAsString(id: String): String = pendingNodeGitFile(id).contentAsString + override def checkPendingNodeExists(id: String): Boolean = pendingNodeGitFile(id).exists + override def getPendingNodeAsString(id: String): String = pendingNodeGitFile(id).contentAsString override def checkAcceptedNodeExists(id: String): Boolean = acceptedNodeGitFile(id).exists override def getAcceptedNodeAsString(id: String): String = acceptedNodeGitFile(id).contentAsString @@ -142,8 +142,8 @@ class TestSaveInventoryLdap extends TestSaveInventory { sb.toString() } - override def checkPendingNodeExists(id: String): Boolean = nodeExists(id, MockLdapFactStorage.pendingDIT) - override def getPendingNodeAsString(id: String): String = nodeAsString(id, MockLdapFactStorage.pendingDIT) + override def checkPendingNodeExists(id: String): Boolean = nodeExists(id, MockLdapFactStorage.pendingDIT) + override def getPendingNodeAsString(id: String): String = nodeAsString(id, MockLdapFactStorage.pendingDIT) override def checkAcceptedNodeExists(id: String): Boolean = nodeExists(id, MockLdapFactStorage.acceptedDIT) override def getAcceptedNodeAsString(id: String): String = nodeAsString(id, MockLdapFactStorage.acceptedDIT) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala index 22b4094a383..a572b796f85 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala @@ -68,7 +68,7 @@ class TestManageMigration_5_6 extends DBCommon with BoxSpecMatcher { detectedFileFormat: Long, migrationStartTime: Option[DateTime] = None, migrationFileFormat: Option[Long] = None - )(f: () => A): A = { + )(f: () => A): A = { val id = migrationEventLogRepository.createNewStatusLine(detectedFileFormat).map(_.id).toOption.get // because test migrationStartTime.foreach(time => migrationEventLogRepository.setMigrationStartTime(id, time)) migrationFileFormat.foreach(format => migrationEventLogRepository.setMigrationFileFormat(id, format, now)) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala index dcfa9392032..3e2c32e72dc 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala @@ -304,24 +304,24 @@ class TestEditorTechniqueWriter extends Specification with ContentMatchers with } def techRepo: TechniqueRepository = new TechniqueRepository { - override def getMetadataContent[T](techniqueId: TechniqueId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? + override def getMetadataContent[T](techniqueId: TechniqueId)(useIt: Option[InputStream] => IOResult[T]): IOResult[T] = ??? override def getTemplateContent[T](techniqueResourceId: TechniqueResourceId)( - useIt: Option[InputStream] => IOResult[T] + useIt: Option[InputStream] => IOResult[T] ): IOResult[T] = ??? override def getFileContent[T](techniqueResourceId: TechniqueResourceId)( - useIt: Option[InputStream] => IOResult[T] + useIt: Option[InputStream] => IOResult[T] ): IOResult[T] = ??? - override def getTechniquesInfo(): TechniquesInfo = ??? - override def getAll(): Map[TechniqueId, domain.Technique] = ??? - override def get(techniqueId: TechniqueId): Option[domain.Technique] = ??? - override def getLastTechniqueByName(techniqueName: TechniqueName): Option[domain.Technique] = ??? - override def getByIds(techniqueIds: Seq[TechniqueId]): Seq[domain.Technique] = ??? - override def getTechniqueVersions(name: TechniqueName): SortedSet[TechniqueVersion] = ??? - override def getByName(name: TechniqueName): Map[TechniqueVersion, domain.Technique] = ??? - override def getTechniqueLibrary: RootTechniqueCategory = ??? - override def getTechniqueCategory(id: TechniqueCategoryId): IOResult[TechniqueCategory] = ??? - override def getParentTechniqueCategory_forTechnique(id: TechniqueId): IOResult[TechniqueCategory] = ??? - override def getAllCategories: Map[TechniqueCategoryId, TechniqueCategory] = ??? + override def getTechniquesInfo(): TechniquesInfo = ??? + override def getAll(): Map[TechniqueId, domain.Technique] = ??? + override def get(techniqueId: TechniqueId): Option[domain.Technique] = ??? + override def getLastTechniqueByName(techniqueName: TechniqueName): Option[domain.Technique] = ??? + override def getByIds(techniqueIds: Seq[TechniqueId]): Seq[domain.Technique] = ??? + override def getTechniqueVersions(name: TechniqueName): SortedSet[TechniqueVersion] = ??? + override def getByName(name: TechniqueName): Map[TechniqueVersion, domain.Technique] = ??? + override def getTechniqueLibrary: RootTechniqueCategory = ??? + override def getTechniqueCategory(id: TechniqueCategoryId): IOResult[TechniqueCategory] = ??? + override def getParentTechniqueCategory_forTechnique(id: TechniqueId): IOResult[TechniqueCategory] = ??? + override def getAllCategories: Map[TechniqueCategoryId, TechniqueCategory] = ??? } val propertyEngineService = new PropertyEngineServiceImpl(List.empty) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala index 7a2fdd935ee..4257eb5c88c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala @@ -274,21 +274,21 @@ class TestEditorTechniqueWriterFallback extends Specification with ContentMatche // check validity of xml file written by rudderc def checkXML( - status: OutputFileStatus + status: OutputFileStatus )(implicit compiler: TechniqueCompilerWithFallback, technique: EditorTechnique): MatchResult[Any] = { checkOutput(compiler, "metadata.xml", technique.id.value, Content.ruddercMetadata, status) } // check validity of .cf file written by rudderc def checkCFE( - status: OutputFileStatus + status: OutputFileStatus )(implicit compiler: TechniqueCompilerWithFallback, technique: EditorTechnique): MatchResult[Any] = { checkOutput(compiler, "technique.cf", technique.id.value, Content.ruddercCFE, status) } // check validity of .ps1 file written by rudderc def checkPS1( - status: OutputFileStatus + status: OutputFileStatus )(implicit compiler: TechniqueCompilerWithFallback, technique: EditorTechnique): MatchResult[Any] = { checkOutput(compiler, "technique.ps1", technique.id.value, Content.ruddercPS1, status) } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala index 18f6af07f4d..99a07beaf8c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala @@ -62,7 +62,7 @@ class GitModificationRepositoryTest extends DBCommon with BoxSpecMatcher { lazy val repos = new GitModificationRepositoryImpl(doobie) implicit def toCommitId(s: String): GitCommitId = GitCommitId(s) - implicit def toModId(s: String): ModificationId = ModificationId(s) + implicit def toModId(s: String): ModificationId = ModificationId(s) sequential diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala index 5a52b81ae00..074d0d05fe6 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala @@ -129,29 +129,29 @@ class ReportingServiceTest extends DBCommon with BoxSpecMatcher { val directivesLib = NodeConfigData.directives val directivesRepos: RoDirectiveRepository = new RoDirectiveRepository() { - def getFullDirectiveLibrary(): IOResult[FullActiveTechniqueCategory] = directivesLib.succeed - def getDirective(directiveId: DirectiveUid): IOResult[Option[Directive]] = ??? - def getDirectiveWithContext(directiveId: DirectiveUid): IOResult[Option[(Technique, ActiveTechnique, Directive)]] = ??? - def getActiveTechniqueAndDirective(id: DirectiveId): IOResult[Option[(ActiveTechnique, Directive)]] = ??? - def getDirectives(activeTechniqueId: ActiveTechniqueId, includeSystem: Boolean = false): IOResult[Seq[Directive]] = ??? + def getFullDirectiveLibrary(): IOResult[FullActiveTechniqueCategory] = directivesLib.succeed + def getDirective(directiveId: DirectiveUid): IOResult[Option[Directive]] = ??? + def getDirectiveWithContext(directiveId: DirectiveUid): IOResult[Option[(Technique, ActiveTechnique, Directive)]] = ??? + def getActiveTechniqueAndDirective(id: DirectiveId): IOResult[Option[(ActiveTechnique, Directive)]] = ??? + def getDirectives(activeTechniqueId: ActiveTechniqueId, includeSystem: Boolean = false): IOResult[Seq[Directive]] = ??? def getActiveTechniqueByCategory( includeSystem: Boolean = false ): IOResult[SortedMap[List[ActiveTechniqueCategoryId], CategoryWithActiveTechniques]] = ??? - def getActiveTechniqueByActiveTechnique(id: ActiveTechniqueId): IOResult[Option[ActiveTechnique]] = ??? - def getActiveTechnique(techniqueName: TechniqueName): IOResult[Option[ActiveTechnique]] = ??? - def activeTechniqueBreadCrump(id: ActiveTechniqueId): IOResult[List[ActiveTechniqueCategory]] = ??? - def getActiveTechniqueLibrary: IOResult[ActiveTechniqueCategory] = ??? - def getAllActiveTechniqueCategories(includeSystem: Boolean = false): IOResult[Seq[ActiveTechniqueCategory]] = ??? - def getActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[Option[ActiveTechniqueCategory]] = ??? - def getParentActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[ActiveTechniqueCategory] = ??? - def getParentsForActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[List[ActiveTechniqueCategory]] = ??? - def getParentsForActiveTechnique(id: ActiveTechniqueId): IOResult[ActiveTechniqueCategory] = ??? - def containsDirective(id: ActiveTechniqueCategoryId): UIO[Boolean] = ??? + def getActiveTechniqueByActiveTechnique(id: ActiveTechniqueId): IOResult[Option[ActiveTechnique]] = ??? + def getActiveTechnique(techniqueName: TechniqueName): IOResult[Option[ActiveTechnique]] = ??? + def activeTechniqueBreadCrump(id: ActiveTechniqueId): IOResult[List[ActiveTechniqueCategory]] = ??? + def getActiveTechniqueLibrary: IOResult[ActiveTechniqueCategory] = ??? + def getAllActiveTechniqueCategories(includeSystem: Boolean = false): IOResult[Seq[ActiveTechniqueCategory]] = ??? + def getActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[Option[ActiveTechniqueCategory]] = ??? + def getParentActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[ActiveTechniqueCategory] = ??? + def getParentsForActiveTechniqueCategory(id: ActiveTechniqueCategoryId): IOResult[List[ActiveTechniqueCategory]] = ??? + def getParentsForActiveTechnique(id: ActiveTechniqueId): IOResult[ActiveTechniqueCategory] = ??? + def containsDirective(id: ActiveTechniqueCategoryId): UIO[Boolean] = ??? } val rulesRepos: RoRuleRepository = new RoRuleRepository { - def getOpt(ruleId: RuleId): IOResult[Option[Rule]] = ??? + def getOpt(ruleId: RuleId): IOResult[Option[Rule]] = ??? def getAll(includeSytem: Boolean = false): IOResult[Seq[Rule]] = ??? def getIds(includeSytem: Boolean = false): IOResult[Set[RuleId]] = ??? @@ -164,21 +164,21 @@ class ReportingServiceTest extends DBCommon with BoxSpecMatcher { def nodeConfigrationService: NodeConfigurationService = null def findDirectiveRuleStatusReportsByRule(ruleId: RuleId)(implicit qc: QueryContext): IOResult[Map[NodeId, NodeStatusReport]] = null - def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = null + def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = null def findStatusReportsForDirective(directiveId: DirectiveId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, NodeStatusReport]] = null - def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = null - def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = null - def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = null - def findUncomputedNodeStatusReports(): Box[Map[NodeId, NodeStatusReport]] = null + def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = null + def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = null + def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = null + def findUncomputedNodeStatusReports(): Box[Map[NodeId, NodeStatusReport]] = null @nowarn() - def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = Full(Map()) + def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = Full(Map()) def getSystemAndUserCompliance( optNodeIds: Option[Set[NodeId]] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? - def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = None + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? + def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = None override def batchSize: Int = 5000 @@ -207,8 +207,8 @@ class ReportingServiceTest extends DBCommon with BoxSpecMatcher { lazy val dummyChangesCache: CachedNodeChangesServiceImpl = { new CachedNodeChangesServiceImpl(new NodeChangesServiceImpl(reportsRepo), () => Full(true)) { - override def update(lowestId: Long, highestId: Long): Box[Unit] = Full(()) - override def countChangesByRuleByInterval(): Box[(Long, ChangesByRule)] = Empty + override def update(lowestId: Long, highestId: Long): Box[Unit] = Full(()) + override def countChangesByRuleByInterval(): Box[(Long, ChangesByRule)] = Empty } } @@ -948,9 +948,9 @@ class ReportingServiceTest extends DBCommon with BoxSpecMatcher { // } implicit def toReport(t: (DateTime, String, String, String, String, String, String, DateTime, String, String)): Reports = { - implicit def toRuleId(s: String) = RuleId(RuleUid(s)) + implicit def toRuleId(s: String) = RuleId(RuleUid(s)) implicit def toDirectiveId(s: String) = DirectiveId(DirectiveUid(s), GitVersion.DEFAULT_REV) - implicit def toNodeId(s: String) = NodeId(s) + implicit def toNodeId(s: String) = NodeId(s) Reports(t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8, t._9, t._10) } @@ -999,8 +999,8 @@ class ReportingServiceTest extends DBCommon with BoxSpecMatcher { (nodeId, lines.map(t => toReport((t._6, t._1, t._3, nodeId, t._2, t._4, t._5, t._6, t._7, t._8)))) } - implicit def toRuleId(id: String): RuleId = RuleId(RuleUid(id)) - implicit def toNodeId(id: String): NodeId = NodeId(id) + implicit def toRuleId(id: String): RuleId = RuleId(RuleUid(id)) + implicit def toNodeId(id: String): NodeId = NodeId(id) implicit def toConfigId(id: String): NodeConfigId = NodeConfigId(id) implicit def agentRuns(runs: (String, Option[(DateTime, Option[String], Long)])*): Map[NodeId, Option[AgentRun]] = { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala index 80ee4eeb7f3..ddd9b65aef7 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala @@ -81,9 +81,9 @@ class ReportsTest extends DBCommon { sequential implicit def toReport(t: (DateTime, String, String, String, String, String, String, DateTime, String, String)): Reports = { - implicit def toRuleId(s: String) = RuleId(RuleUid(s)) + implicit def toRuleId(s: String) = RuleId(RuleUid(s)) implicit def toDirectiveId(s: String) = DirectiveId(DirectiveUid(s)) - implicit def toNodeId(s: String) = NodeId(s) + implicit def toNodeId(s: String) = NodeId(s) Reports(t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8, t._9, t._10) } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala index 5e80ac0967c..1d631f4cb50 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala @@ -38,7 +38,7 @@ final case class SystemError(cause: Throwable) extends RudderError { object StringMarshaller extends FileMarshalling[String] { // simply read / write file content - override def fromFile(in: File): IOResult[String] = ZIO.attempt(FileUtils.readFileToString(in, "UTF-8")).mapError(SystemError) + override def fromFile(in: File): IOResult[String] = ZIO.attempt(FileUtils.readFileToString(in, "UTF-8")).mapError(SystemError) override def toFile(out: File, data: String): IOResult[String] = ZIO.attempt { FileUtils.writeStringToFile(out, data, "UTF-8") data @@ -46,7 +46,7 @@ object StringMarshaller extends FileMarshalling[String] { } object StringId extends IdToFilenameConverter[String] { - override def idToFilename(id: String): String = id + override def idToFilename(id: String): String = id override def filenameToId(name: String): String = name } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala index 9e11ec40901..fef650f811d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala @@ -588,18 +588,18 @@ ootapja6lKOaIpqp0kmmYN7gFIhp * Some directives * ************************************************************************ */ - implicit def toATID(s: String): ActiveTechniqueId = ActiveTechniqueId(s) - implicit def toTV(s: String): TechniqueVersion = TechniqueVersionHelper(s) - implicit def toTN(s: String): TechniqueName = TechniqueName(s) - implicit def toTID(id: (String, String)): TechniqueId = TechniqueId(id._1, id._2) - implicit def toDID(id: String): DirectiveId = DirectiveId(DirectiveUid(id), GitVersion.DEFAULT_REV) - implicit def toRID(id: String): RuleId = RuleId(RuleUid(id)) - implicit def toRCID(id: String): RuleCategoryId = RuleCategoryId(id) - val t1: Technique = Technique(("t1", "1.0"), "t1", "t1", Nil, TrackerVariableSpec(None, None), SectionSpec("root"), None) - val d1: Directive = Directive("d1", "1.0", Map("foo1" -> Seq("bar1")), "d1", "d1", None) - val d2: Directive = Directive("d2", "1.0", Map("foo2" -> Seq("bar2")), "d2", "d2", Some(PolicyMode.Enforce)) - val d3: Directive = Directive("d3", "1.0", Map("foo3" -> Seq("bar3")), "d3", "d3", Some(PolicyMode.Audit)) - val fat1: FullActiveTechnique = FullActiveTechnique( + implicit def toATID(s: String): ActiveTechniqueId = ActiveTechniqueId(s) + implicit def toTV(s: String): TechniqueVersion = TechniqueVersionHelper(s) + implicit def toTN(s: String): TechniqueName = TechniqueName(s) + implicit def toTID(id: (String, String)): TechniqueId = TechniqueId(id._1, id._2) + implicit def toDID(id: String): DirectiveId = DirectiveId(DirectiveUid(id), GitVersion.DEFAULT_REV) + implicit def toRID(id: String): RuleId = RuleId(RuleUid(id)) + implicit def toRCID(id: String): RuleCategoryId = RuleCategoryId(id) + val t1: Technique = Technique(("t1", "1.0"), "t1", "t1", Nil, TrackerVariableSpec(None, None), SectionSpec("root"), None) + val d1: Directive = Directive("d1", "1.0", Map("foo1" -> Seq("bar1")), "d1", "d1", None) + val d2: Directive = Directive("d2", "1.0", Map("foo2" -> Seq("bar2")), "d2", "d2", Some(PolicyMode.Enforce)) + val d3: Directive = Directive("d3", "1.0", Map("foo3" -> Seq("bar3")), "d3", "d3", Some(PolicyMode.Audit)) + val fat1: FullActiveTechnique = FullActiveTechnique( "d1", "t1", SortedMap(toTV("1.0") -> DateTime.parse("2016-01-01T12:00:00.000+00:00")), @@ -749,13 +749,13 @@ class TestNodeConfiguration( ).succeed } - override def savePolicyServers(policyServers: PolicyServers): IOResult[PolicyServers] = ??? + override def savePolicyServers(policyServers: PolicyServers): IOResult[PolicyServers] = ??? override def updatePolicyServers( commands: List[PolicyServersUpdateCommand], modId: ModificationId, actor: EventActor ): IOResult[PolicyServers] = ??? - override def deleteRelaySystemObjects(policyServerId: NodeId): IOResult[Unit] = ??? + override def deleteRelaySystemObjects(policyServerId: NodeId): IOResult[Unit] = ??? } val t7: Long = System.currentTimeMillis() NodeConfigData.logger.trace(s"Policy Server Management: ${t7 - t6} ms") diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala index 34b30110632..3d4aa9b57af 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala @@ -142,7 +142,7 @@ class TestNodeAndGlobalParameterLookup extends Specification { def lookup( variables: Seq[Variable], pContext: ParamInterpolationContext - )(test: Seq[Seq[String]] => org.specs2.execute.Result): org.specs2.execute.Result = { + )(test: Seq[Seq[String]] => org.specs2.execute.Result): org.specs2.execute.Result = { lookupParam(variables, pContext).either.runNow match { case Left(err) => failure("Error in test: " + err.fullMsg) case Right(res) => test(res.values.map(_.values).toSeq) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala index 3e4a57e755c..ccd6dc4c353 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala @@ -60,8 +60,8 @@ import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) class PolicyAgregationTest extends Specification { - implicit def str2pId(id: String): TechniqueId = TechniqueId(TechniqueName(id), TechniqueVersionHelper("1.0")) - implicit def str2PolicyId(id: String): PolicyId = + implicit def str2pId(id: String): TechniqueId = TechniqueId(TechniqueName(id), TechniqueVersionHelper("1.0")) + implicit def str2PolicyId(id: String): PolicyId = PolicyId(RuleId(RuleUid("r_" + id)), DirectiveId(DirectiveUid("d_" + id)), TechniqueVersionHelper("1.0")) // we are testing error cases, so we don't want to output error log for them diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala index dfa5b334fec..f3dda1a56ea 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala @@ -66,7 +66,7 @@ import zio.syntax._ @RunWith(classOf[BlockJUnit4ClassRunner]) class TestNodeFactQueryProcessor { - implicit def StringToNodeId(s: String): NodeId = NodeId(s) + implicit def StringToNodeId(s: String): NodeId = NodeId(s) implicit def StringToGroupId(s: String): NodeGroupId = NodeGroupId(NodeGroupUid(s)) val logger: NamedZioLogger = NamedZioLogger(this.getClass.getPackageName + "." + this.getClass.getSimpleName) @@ -1296,7 +1296,7 @@ class TestNodeFactQueryProcessor { @Test def nodePropertiesFailingReq(): Unit = { def forceParse(q: String) = parser(q).openOrThrowException("Parsing the request must be ok for that test") // Failing request, see #10570 - val failingRegexRequests = { + val failingRegexRequests = { """ { "select":"node", "where":[ { "objectType":"serializedNodeProperty", "attribute":"name.value", "comparator":"regex", "value":"f{o}o" } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala index 51510a42503..e2a31d3c777 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala @@ -111,7 +111,7 @@ class TestPendingNodePolicies extends Specification { // a query line for sub group def sub(g: NodeGroup): CriterionLine = CriterionLine(groupCriterion, groupCriterion.criteria.head, Equals, g.id.serialize) // a random query that will be added as dummy content - query checker will returns pre-defined things - val cl: CriterionLine = CriterionLine( + val cl: CriterionLine = CriterionLine( ObjectCriterion( OC_MACHINE, Seq(Criterion(A_MACHINE_UUID, StringComparator, NodeCriterionMatcherString(n => Chunk(n.machine.id.value)))) @@ -124,11 +124,11 @@ class TestPendingNodePolicies extends Specification { // the node that we will try to accept val node: NodeId = NodeId("node") - def orQuery(g: NodeGroup): Query = Query(null, Or, Identity, List(cl, sub(g), cl)) - def andQuery(g: NodeGroup): Query = Query(null, And, Identity, List(cl, sub(g), cl)) + def orQuery(g: NodeGroup): Query = Query(null, Or, Identity, List(cl, sub(g), cl)) + def andQuery(g: NodeGroup): Query = Query(null, And, Identity, List(cl, sub(g), cl)) def onlySubQuery(g: NodeGroup): Query = Query(null, And, Identity, List(sub(g))) - val dummyQuery0: Query = Query(null, And, Identity, List(cl)) // will return 0 node - val dummyQuery1: Query = Query(null, Or, Identity, List(cl)) // will return 1 node + val dummyQuery0: Query = Query(null, And, Identity, List(cl)) // will return 0 node + val dummyQuery1: Query = Query(null, Or, Identity, List(cl)) // will return 1 node def ng(id: String, q: Query, dyn: Boolean = true): NodeGroup = NodeGroup(NodeGroupId(NodeGroupUid(id)), id, id, Nil, Some(q), dyn, Set(), true, false) @@ -177,7 +177,7 @@ class TestPendingNodePolicies extends Specification { ) def getAllDynGroupsWithandWithoutDependencies(): Box[(Seq[NodeGroupId], Seq[NodeGroupId])] = ??? - override def changesSince(lastTime: DateTime): Box[Boolean] = Full(true) + override def changesSince(lastTime: DateTime): Box[Boolean] = Full(true) } // a fake query checker diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala index a54b04e9dd2..51083dc66f1 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala @@ -160,54 +160,54 @@ class CachedFindRuleNodeStatusReportsTest extends Specification { var updated: List[NodeId] = Nil override def defaultFindRuleNodeStatusReports: DefaultFindRuleNodeStatusReports = new DefaultFindRuleNodeStatusReports() { - override def confExpectedRepo: FindExpectedReportRepository = ??? - override def reportsRepository: ReportsRepository = ??? - override def agentRunRepository: RoReportsExecutionRepository = ??? - override def getGlobalComplianceMode: () => Box[GlobalComplianceMode] = ??? - override def getUnexpectedInterpretation: () => Box[UnexpectedReportInterpretation] = ??? + override def confExpectedRepo: FindExpectedReportRepository = ??? + override def reportsRepository: ReportsRepository = ??? + override def agentRunRepository: RoReportsExecutionRepository = ??? + override def getGlobalComplianceMode: () => Box[GlobalComplianceMode] = ??? + override def getUnexpectedInterpretation: () => Box[UnexpectedReportInterpretation] = ??? override def findDirectiveRuleStatusReportsByRule(ruleId: RuleId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, NodeStatusReport]] = ??? - override def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? + override def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? override def getSystemAndUserCompliance( optNodeIds: Option[Set[NodeId]] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? - override def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = ??? - override def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = ??? - override def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - override def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - override def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - override def nodeConfigService: NodeConfigurationService = ??? - override def jdbcMaxBatchSize: Int = batchSize + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? + override def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = ??? + override def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = ??? + override def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + override def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + override def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + override def nodeConfigService: NodeConfigurationService = ??? + override def jdbcMaxBatchSize: Int = batchSize override def findRuleNodeStatusReports(nodeIds: Set[NodeId], ruleIds: Set[RuleId])(implicit - qc: QueryContext + qc: QueryContext ): Box[Map[NodeId, NodeStatusReport]] = { updated = (updated ++ nodeIds) Full(reports.filter(x => nodeIds.contains(x._1))) } def findStatusReportsForDirective(directiveId: DirectiveId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, NodeStatusReport]] = ??? } override def nodeFactRepository: NodeFactRepository = nodeFactRepo override def findDirectiveRuleStatusReportsByRule(ruleId: RuleId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, NodeStatusReport]] = ??? - override def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - override def findUncomputedNodeStatusReports(): Box[Map[NodeId, NodeStatusReport]] = ??? - override def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? - override def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = ??? - override def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = ??? - override def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - override def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + override def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + override def findUncomputedNodeStatusReports(): Box[Map[NodeId, NodeStatusReport]] = ??? + override def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? + override def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = ??? + override def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = ??? + override def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + override def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? override def getSystemAndUserCompliance( optNodeIds: Option[Set[NodeId]] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? def findStatusReportsForDirective(directiveId: DirectiveId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, NodeStatusReport]] = ??? override def scoreServiceManager: ScoreServiceManager = new ScoreServiceManager(new ScoreService { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala index 073bf66b2e2..4bc18c28e80 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala @@ -68,9 +68,9 @@ import scala.annotation.nowarn @RunWith(classOf[JUnitRunner]) class ExecutionBatchTest extends Specification { implicit private def str2directiveId(s: String): DirectiveId = DirectiveId(DirectiveUid(s)) - implicit private def str2ruleId(s: String): RuleId = RuleId(RuleUid(s)) - implicit private def str2nodeId(s: String): NodeId = NodeId(s) - implicit private def str2ruleUid(s: String): RuleUid = RuleUid(s) + implicit private def str2ruleId(s: String): RuleId = RuleId(RuleUid(s)) + implicit private def str2nodeId(s: String): NodeId = NodeId(s) + implicit private def str2ruleUid(s: String): RuleUid = RuleUid(s) // a logger for timing information val logger: Logger = org.slf4j.LoggerFactory.getLogger("timing-test").asInstanceOf[ch.qos.logback.classic.Logger] diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala index dafb09974f5..8443b27dafe 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala @@ -76,8 +76,8 @@ class ReportingServiceUtilsTest extends Specification { val expiration = new DateTime(0) // not used val noOverrides = Nil - def dirReport(id: DirectiveId): (DirectiveId, DirectiveStatusReport) = (id, DirectiveStatusReport(id, Nil)) - def rnReport(nodeId: NodeId, ruleId: RuleId, directives: DirectiveId*): RuleNodeStatusReport = { + def dirReport(id: DirectiveId): (DirectiveId, DirectiveStatusReport) = (id, DirectiveStatusReport(id, Nil)) + def rnReport(nodeId: NodeId, ruleId: RuleId, directives: DirectiveId*): RuleNodeStatusReport = { RuleNodeStatusReport(nodeId, ruleId, None, None, directives.map(dirReport _).toMap, expiration) } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala index e0a8f106238..bf3ed9706c0 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala @@ -159,7 +159,7 @@ trait ReadConfigService { GlobalPolicyMode(mode, if (overridable) PolicyModeOverrides.Always else PolicyModeOverrides.Unoverridable) } } - def rudder_policy_mode_name(): IOResult[PolicyMode] + def rudder_policy_mode_name(): IOResult[PolicyMode] def rudder_policy_overridable(): IOResult[Boolean] /** @@ -457,21 +457,21 @@ class GenericConfigService( } private[this] def save[T](name: String, value: T, modifyGlobalPropertyInfo: Option[ModifyGlobalPropertyInfo] = None)(implicit - ser: T => String + ser: T => String ): IOResult[RudderWebProperty] = { val p = RudderWebProperty(RudderWebPropertyName(name), ser(value), "") repos.saveConfigParameter(p, modifyGlobalPropertyInfo) } - implicit private[this] def serInt(x: Int): String = x.toString - implicit private[this] def serPolicyMode(x: PolicyMode): String = x.name + implicit private[this] def serInt(x: Int): String = x.toString + implicit private[this] def serPolicyMode(x: PolicyMode): String = x.name implicit private[this] def serFeatureSwitch(x: FeatureSwitch): String = x.name implicit private[this] def toBoolean(p: RudderWebProperty): Boolean = p.value.toLowerCase match { case "true" | "1" => true case _ => false } - implicit private[this] def serBoolean(x: Boolean): String = if (x) "true" else "false" + implicit private[this] def serBoolean(x: Boolean): String = if (x) "true" else "false" // default is HTTPS, in particular for "" implicit private[this] def toReportProtocol(p: RudderWebProperty): AgentReportingProtocol = p.value match { @@ -558,28 +558,28 @@ class GenericConfigService( FeatureSwitch.Disabled } - def rudder_ui_changeMessage_enabled(): IOResult[Boolean] = get("rudder_ui_changeMessage_enabled") - def rudder_ui_changeMessage_mandatory(): IOResult[Boolean] = get("rudder_ui_changeMessage_mandatory") - def rudder_ui_changeMessage_explanation(): IOResult[String] = get("rudder_ui_changeMessage_explanation") - def set_rudder_ui_changeMessage_enabled(value: Boolean): IOResult[Unit] = save("rudder_ui_changeMessage_enabled", value) - def set_rudder_ui_changeMessage_mandatory(value: Boolean): IOResult[Unit] = save("rudder_ui_changeMessage_mandatory", value) - def set_rudder_ui_changeMessage_explanation(value: String): IOResult[Unit] = save("rudder_ui_changeMessage_explanation", value) + def rudder_ui_changeMessage_enabled(): IOResult[Boolean] = get("rudder_ui_changeMessage_enabled") + def rudder_ui_changeMessage_mandatory(): IOResult[Boolean] = get("rudder_ui_changeMessage_mandatory") + def rudder_ui_changeMessage_explanation(): IOResult[String] = get("rudder_ui_changeMessage_explanation") + def set_rudder_ui_changeMessage_enabled(value: Boolean): IOResult[Unit] = save("rudder_ui_changeMessage_enabled", value) + def set_rudder_ui_changeMessage_mandatory(value: Boolean): IOResult[Unit] = save("rudder_ui_changeMessage_mandatory", value) + def set_rudder_ui_changeMessage_explanation(value: String): IOResult[Unit] = save("rudder_ui_changeMessage_explanation", value) ///// workflows ///// - def rudder_workflow_enabled(): IOResult[Boolean] = { + def rudder_workflow_enabled(): IOResult[Boolean] = { if (workflowLevel.workflowLevelAllowsEnable) { get("rudder_workflow_enabled") } else { false.succeed } } - def rudder_workflow_self_validation(): IOResult[Boolean] = get("rudder_workflow_self_validation") - def rudder_workflow_self_deployment(): IOResult[Boolean] = get("rudder_workflow_self_deployment") + def rudder_workflow_self_validation(): IOResult[Boolean] = get("rudder_workflow_self_validation") + def rudder_workflow_self_deployment(): IOResult[Boolean] = get("rudder_workflow_self_deployment") def rudder_workflow_validate_all(): IOResult[Boolean] = get("rudder_workflow_validate_all") def set_rudder_workflow_validate_all(value: Boolean): IOResult[Unit] = save("rudder_workflow_validate_all", value).unit - def set_rudder_workflow_enabled(value: Boolean): IOResult[Unit] = { + def set_rudder_workflow_enabled(value: Boolean): IOResult[Unit] = { if (workflowLevel.workflowLevelAllowsEnable) { save("rudder_workflow_enabled", value) <* IOResult.attempt(workflowUpdate ! WorkflowUpdate) @@ -593,18 +593,18 @@ class GenericConfigService( def set_rudder_workflow_self_deployment(value: Boolean): IOResult[Unit] = save("rudder_workflow_self_deployment", value) ///// CFEngine server ///// - def cfengine_server_denybadclocks(): IOResult[Boolean] = get("cfengine_server_denybadclocks") - def set_cfengine_server_denybadclocks(value: Boolean): IOResult[Unit] = save("cfengine_server_denybadclocks", value) - def cfengine_server_skipidentify(): IOResult[Boolean] = get("cfengine_server_skipidentify") - def set_cfengine_server_skipidentify(value: Boolean): IOResult[Unit] = save("cfengine_server_skipidentify", value) + def cfengine_server_denybadclocks(): IOResult[Boolean] = get("cfengine_server_denybadclocks") + def set_cfengine_server_denybadclocks(value: Boolean): IOResult[Unit] = save("cfengine_server_denybadclocks", value) + def cfengine_server_skipidentify(): IOResult[Boolean] = get("cfengine_server_skipidentify") + def set_cfengine_server_skipidentify(value: Boolean): IOResult[Unit] = save("cfengine_server_skipidentify", value) // Relay synchronization configuration - def relay_server_sync_method(): IOResult[RelaySynchronizationMethod] = get("relay.sync.method") - def set_relay_server_sync_method(value: RelaySynchronizationMethod): IOResult[Unit] = save("relay.sync.method", value.value) - def relay_server_syncpromises(): IOResult[Boolean] = get("relay.sync.promises") - def set_relay_server_syncpromises(value: Boolean): IOResult[Unit] = save("relay.sync.promises", value) - def relay_server_syncsharedfiles(): IOResult[Boolean] = get("relay.sync.sharedfiles") - def set_relay_server_syncsharedfiles(value: Boolean): IOResult[Unit] = save("relay.sync.sharedfiles", value) + def relay_server_sync_method(): IOResult[RelaySynchronizationMethod] = get("relay.sync.method") + def set_relay_server_sync_method(value: RelaySynchronizationMethod): IOResult[Unit] = save("relay.sync.method", value.value) + def relay_server_syncpromises(): IOResult[Boolean] = get("relay.sync.promises") + def set_relay_server_syncpromises(value: Boolean): IOResult[Unit] = save("relay.sync.promises", value) + def relay_server_syncsharedfiles(): IOResult[Boolean] = get("relay.sync.sharedfiles") + def set_relay_server_syncsharedfiles(value: Boolean): IOResult[Unit] = save("relay.sync.sharedfiles", value) def agent_run_interval(): IOResult[Int] = getIO("agent_run_interval") def set_agent_run_interval(value: Int, actor: EventActor, reason: Option[String]): IOResult[Unit] = { @@ -631,10 +631,10 @@ class GenericConfigService( } ///// CFEngine server ///// - def cfengine_modified_files_ttl(): IOResult[Int] = getIO("cfengine_modified_files_ttl") + def cfengine_modified_files_ttl(): IOResult[Int] = getIO("cfengine_modified_files_ttl") def set_cfengine_modified_files_ttl(value: Int): IOResult[Unit] = save("cfengine_modified_files_ttl", value) - def cfengine_outputs_ttl(): IOResult[Int] = getIO("cfengine_outputs_ttl") - def set_cfengine_outputs_ttl(value: Int): IOResult[Unit] = save("cfengine_outputs_ttl", value) + def cfengine_outputs_ttl(): IOResult[Int] = getIO("cfengine_outputs_ttl") + def set_cfengine_outputs_ttl(value: Int): IOResult[Unit] = save("cfengine_outputs_ttl", value) /** * Compliance mode @@ -683,8 +683,8 @@ class GenericConfigService( /** * Should we display recent changes graphs ? */ - def display_changes_graph(): IOResult[Boolean] = get("display_changes_graph") - def set_display_changes_graph(displayGraphs: Boolean): IOResult[Unit] = save("display_changes_graph", displayGraphs) + def display_changes_graph(): IOResult[Boolean] = get("display_changes_graph") + def set_display_changes_graph(displayGraphs: Boolean): IOResult[Unit] = save("display_changes_graph", displayGraphs) /** * Should we always display compliance/recent change columns ? @@ -720,8 +720,8 @@ class GenericConfigService( * Do we allow duplicate hostname for nodes? * (true: yes, duplicate hostname are accepted) */ - def node_accept_duplicated_hostname(): IOResult[Boolean] = get("node_accept_duplicated_hostname") - def set_node_accept_duplicated_hostname(accept: Boolean): IOResult[Unit] = save("node_accept_duplicated_hostname", accept) + def node_accept_duplicated_hostname(): IOResult[Boolean] = get("node_accept_duplicated_hostname") + def set_node_accept_duplicated_hostname(accept: Boolean): IOResult[Unit] = save("node_accept_duplicated_hostname", accept) def rudder_compliance_unexpected_report_interpretation(): IOResult[UnexpectedReportInterpretation] = { for { @@ -739,34 +739,34 @@ class GenericConfigService( } ///// debug / perf ///// - def rudder_compute_changes(): IOResult[Boolean] = get("rudder_compute_changes") - def set_rudder_compute_changes(value: Boolean): IOResult[Unit] = save("rudder_compute_changes", value) - def rudder_generation_compute_dyngroups(): IOResult[Boolean] = get("rudder_generation_compute_dyngroups") - def set_rudder_generation_compute_dyngroups(value: Boolean): IOResult[Unit] = save("rudder_generation_compute_dyngroups", value) - def rudder_save_db_compliance_levels(): IOResult[Boolean] = get("rudder_save_db_compliance_levels") - def set_rudder_save_db_compliance_levels(value: Boolean): IOResult[Unit] = save("rudder_save_db_compliance_levels", value) - def rudder_save_db_compliance_details(): IOResult[Boolean] = get("rudder_save_db_compliance_details") - def set_rudder_save_db_compliance_details(value: Boolean): IOResult[Unit] = save("rudder_save_db_compliance_details", value) + def rudder_compute_changes(): IOResult[Boolean] = get("rudder_compute_changes") + def set_rudder_compute_changes(value: Boolean): IOResult[Unit] = save("rudder_compute_changes", value) + def rudder_generation_compute_dyngroups(): IOResult[Boolean] = get("rudder_generation_compute_dyngroups") + def set_rudder_generation_compute_dyngroups(value: Boolean): IOResult[Unit] = save("rudder_generation_compute_dyngroups", value) + def rudder_save_db_compliance_levels(): IOResult[Boolean] = get("rudder_save_db_compliance_levels") + def set_rudder_save_db_compliance_levels(value: Boolean): IOResult[Unit] = save("rudder_save_db_compliance_levels", value) + def rudder_save_db_compliance_details(): IOResult[Boolean] = get("rudder_save_db_compliance_details") + def set_rudder_save_db_compliance_details(value: Boolean): IOResult[Unit] = save("rudder_save_db_compliance_details", value) /// generation: js timeout, parallelism - def rudder_generation_max_parallelism(): IOResult[String] = get("rudder_generation_max_parallelism") - def set_rudder_generation_max_parallelism(value: String): IOResult[Unit] = save("rudder_generation_max_parallelism", value) - def rudder_generation_js_timeout(): IOResult[Int] = getIO("rudder_generation_js_timeout") - def set_rudder_generation_js_timeout(value: Int): IOResult[Unit] = save("rudder_generation_js_timeout", value) + def rudder_generation_max_parallelism(): IOResult[String] = get("rudder_generation_max_parallelism") + def set_rudder_generation_max_parallelism(value: String): IOResult[Unit] = save("rudder_generation_max_parallelism", value) + def rudder_generation_js_timeout(): IOResult[Int] = getIO("rudder_generation_js_timeout") + def set_rudder_generation_js_timeout(value: Int): IOResult[Unit] = save("rudder_generation_js_timeout", value) - def rudder_generation_continue_on_error(): IOResult[Boolean] = get("rudder_generation_continue_on_error") - def set_rudder_generation_continue_on_error(value: Boolean): IOResult[Unit] = save("rudder_generation_continue_on_error", value) + def rudder_generation_continue_on_error(): IOResult[Boolean] = get("rudder_generation_continue_on_error") + def set_rudder_generation_continue_on_error(value: Boolean): IOResult[Unit] = save("rudder_generation_continue_on_error", value) - def rudder_generation_delay(): IOResult[Duration] = getIO("rudder_generation_delay") - def set_rudder_generation_delay(value: Duration): IOResult[Unit] = save("rudder_generation_delay", value.toString) + def rudder_generation_delay(): IOResult[Duration] = getIO("rudder_generation_delay") + def set_rudder_generation_delay(value: Duration): IOResult[Unit] = save("rudder_generation_delay", value.toString) - def rudder_generation_trigger(): IOResult[PolicyGenerationTrigger] = getIO("rudder_generation_trigger") - def set_rudder_generation_trigger(value: PolicyGenerationTrigger): IOResult[Unit] = save("rudder_generation_trigger", value) + def rudder_generation_trigger(): IOResult[PolicyGenerationTrigger] = getIO("rudder_generation_trigger") + def set_rudder_generation_trigger(value: PolicyGenerationTrigger): IOResult[Unit] = save("rudder_generation_trigger", value) def rudder_compute_dyngroups_max_parallelism(): IOResult[String] = get("rudder_compute_dyngroups_max_parallelism") def set_rudder_compute_dyngroups_max_parallelism(value: String): IOResult[Unit] = save("rudder_compute_dyngroups_max_parallelism", value) - def rudder_setup_done(): IOResult[Boolean] = get("rudder_setup_done") - def set_rudder_setup_done(value: Boolean): IOResult[Unit] = save("rudder_setup_done", value) + def rudder_setup_done(): IOResult[Boolean] = get("rudder_setup_done") + def set_rudder_setup_done(value: Boolean): IOResult[Unit] = save("rudder_setup_done", value) } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala index 73f8d9b3048..f8401efe3e0 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala @@ -217,14 +217,14 @@ object AuthorizationType { */ def allKind: Set[AuthorizationType] = allKindsMap - private[this] var allKindsMap: Set[AuthorizationType] = { + private[this] var allKindsMap: Set[AuthorizationType] = { Set( AnyRights ) ++ Administration.values ++ Compliance.values ++ Configuration.values ++ Deployer.values ++ Deployment.values ++ Directive.values ++ Group.values ++ Node.values ++ Rule.values ++ Parameter.values ++ Technique.values ++ UserAccount.values ++ Validator.values } - def addAuthKind(newKinds: Set[AuthorizationType]): Unit = allKindsMap = allKindsMap ++ newKinds + def addAuthKind(newKinds: Set[AuthorizationType]): Unit = allKindsMap = allKindsMap ++ newKinds /* * Parse a right string (ie: object_operation) as a set of authorization type, taking care of the special keyword "all" @@ -331,8 +331,8 @@ object Rights { * make sense from a rudder usage point of view. */ sealed trait Role { - def name: String - def rights: Rights + def name: String + def rights: Rights def debugString: String = name } object Role { @@ -402,7 +402,7 @@ object Role { ).map(r => (r._name, r)).toMap } - def forRight(right: AuthorizationType): Custom = Custom(Rights.forAuthzs(right)) + def forRight(right: AuthorizationType): Custom = Custom(Rights.forAuthzs(right)) def forRights(rights: Set[AuthorizationType]): Custom = Custom(Rights(rights)) // this is the named custom roles defined in tag diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala index c3dfa81c977..785c2da350a 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala @@ -203,7 +203,7 @@ trait EndpointSchema { // ACTION+PATH couple. // typically, several version of the same API will have the // same name, but not the same path. - def name: String = { + def name: String = { val n = this.getClass.getSimpleName() n(0).toLower.toString + n.substring(1, n.size - 1) // also remove the last '$' } @@ -241,7 +241,7 @@ object EndpointSchema { def /(s: String) = (action, ApiPath.of(s)) } implicit class AddPath(val pair: (HttpAction, ApiPath)) extends AnyVal { - def /(s: String) = (pair._1, pair._2 / s) + def /(s: String) = (pair._1, pair._2 / s) def /(path: ApiPath) = (pair._1, ApiPath(pair._2.parts.concatNel(path.parts))) } } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala index 2640335f408..a27a18ef975 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala @@ -127,7 +127,7 @@ final case class RestExtractorService( */ private[this] def extractOneValue[T](params: Map[String, List[String]], key: String)( - to: (String) => Box[T] = ((value: String) => Full(value)) + to: (String) => Box[T] = ((value: String) => Full(value)) ) = { params.get(key) match { case None => Full(None) @@ -137,7 +137,7 @@ final case class RestExtractorService( } private[this] def extractList[T](params: Map[String, List[String]], key: String)( - to: (List[String]) => Box[T] + to: (List[String]) => Box[T] ): Box[Option[T]] = { params.get(key) match { case None => Full(None) @@ -1208,10 +1208,10 @@ final case class RestExtractorService( } def extractMap[T, U](key: String)(req: Req)( - keyFun: String => T, - jsonValueFun: JValue => U, - paramValueFun: String => U, - paramMapSepartor: String + keyFun: String => T, + jsonValueFun: JValue => U, + paramValueFun: String => U, + paramMapSepartor: String ): Box[Option[Map[T, U]]] = { req.json match { case Full(json) => diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala index ef39d638da5..dddd14989a5 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala @@ -219,7 +219,7 @@ object RestUtils extends Loggable { restExtractor: RestExtractorService, dataName: String, id: Option[String] - )(function: Box[JValue], req: Req, errorMessage: String)(implicit action: String): LiftResponse = { + )(function: Box[JValue], req: Req, errorMessage: String)(implicit action: String): LiftResponse = { implicit val prettify = restExtractor.extractPrettify(req.params) function match { case Full(category: JValue) => @@ -234,17 +234,17 @@ object RestUtils extends Loggable { type ActionType = (EventActor, ModificationId, Option[String]) => Box[JValue] def actionResponse(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])( - function: Box[ActionType], - req: Req, - errorMessage: String - )(implicit action: String, userService: UserService): LiftResponse = { + function: Box[ActionType], + req: Req, + errorMessage: String + )(implicit action: String, userService: UserService): LiftResponse = { actionResponse2(restExtractor, dataName, uuidGen, id)(function, req, errorMessage)(action, RestUtils.getActor(req)) } def actionResponse2(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])( - function: Box[ActionType], - req: Req, - errorMessage: String - )(implicit action: String, actor: EventActor): LiftResponse = { + function: Box[ActionType], + req: Req, + errorMessage: String + )(implicit action: String, actor: EventActor): LiftResponse = { implicit val prettify = restExtractor.extractPrettify(req.params) (for { @@ -264,22 +264,22 @@ object RestUtils extends Loggable { type WorkflowType = (EventActor, Option[String], String, String) => Box[JValue] def workflowResponse(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])( - function: Box[WorkflowType], - req: Req, - errorMessage: String, - defaultName: String - )(implicit action: String, userService: UserService): LiftResponse = { + function: Box[WorkflowType], + req: Req, + errorMessage: String, + defaultName: String + )(implicit action: String, userService: UserService): LiftResponse = { workflowResponse2(restExtractor, dataName, uuidGen, id)(function, req, errorMessage, defaultName)( action, RestUtils.getActor(req) ) } def workflowResponse2(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])( - function: Box[WorkflowType], - req: Req, - errorMessage: String, - defaultName: String - )(implicit action: String, actor: EventActor): LiftResponse = { + function: Box[WorkflowType], + req: Req, + errorMessage: String, + defaultName: String + )(implicit action: String, actor: EventActor): LiftResponse = { implicit val prettify = restExtractor.extractPrettify(req.params) (for { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala index 1159f0fdd83..a4e3fa0835d 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala @@ -134,8 +134,8 @@ object RudderJsonResponse { // Success @nowarn("msg=parameter encoder .* is never used") // used by magnolia macro def successOne[A](schema: ResponseSchema, obj: A, id: Option[String])(implicit - prettify: Boolean, - encoder: JsonEncoder[A] + prettify: Boolean, + encoder: JsonEncoder[A] ): LiftJsonResponse[_ <: JsonRudderApiResponse[_]] = { schema.dataContainer match { case Some(key) => @@ -148,8 +148,8 @@ object RudderJsonResponse { } @nowarn("msg=parameter encoder .* is never used") // used by magnolia macro def successList[A](schema: ResponseSchema, objs: List[A])(implicit - prettify: Boolean, - encoder: JsonEncoder[A] + prettify: Boolean, + encoder: JsonEncoder[A] ): LiftJsonResponse[ _ <: JsonRudderApiResponse[_ <: immutable.Iterable[Any] with PartialFunction[Int with String, Any] with Equals] ] = { @@ -163,30 +163,30 @@ object RudderJsonResponse { } } def successZero(schema: ResponseSchema, msg: String)(implicit - prettify: Boolean + prettify: Boolean ): LiftJsonResponse[JsonRudderApiResponse[String]] = { implicit val enc = DeriveJsonEncoder.gen[JsonRudderApiResponse[String]] generic.success(JsonRudderApiResponse.success(schema, None, msg)) } // errors implicit val nothing: JsonEncoder[Option[Unit]] = new JsonEncoder[Option[Unit]] { - def unsafeEncode(n: Option[Unit], indent: Option[Int], out: zio.json.internal.Write): Unit = out.write("null") - override def isNothing(a: Option[Unit]): Boolean = true + def unsafeEncode(n: Option[Unit], indent: Option[Int], out: zio.json.internal.Write): Unit = out.write("null") + override def isNothing(a: Option[Unit]): Boolean = true } implicit val errorEncoder: JsonEncoder[JsonRudderApiResponse[Unit]] = DeriveJsonEncoder.gen def internalError(id: Option[String], schema: ResponseSchema, errorMsg: String)(implicit - prettify: Boolean + prettify: Boolean ): LiftJsonResponse[JsonRudderApiResponse[Unit]] = { generic.internalError(JsonRudderApiResponse.error(id, schema, errorMsg)) } def notFoundError(id: Option[String], schema: ResponseSchema, errorMsg: String)(implicit - prettify: Boolean + prettify: Boolean ): LiftJsonResponse[JsonRudderApiResponse[Unit]] = { generic.notFoundError(JsonRudderApiResponse.error(id, schema, errorMsg)) } def forbiddenError(id: Option[String], schema: ResponseSchema, errorMsg: String)(implicit - prettify: Boolean + prettify: Boolean ): LiftJsonResponse[JsonRudderApiResponse[Unit]] = { generic.forbiddenError(JsonRudderApiResponse.error(id, schema, errorMsg)) } @@ -229,7 +229,7 @@ object RudderJsonResponse { case class SuccessIdTrace(computeId: A => Option[String]) extends IdTrace private def toLiftResponseOne(params: DefaultParams, schema: ResponseSchema, id: IdTrace)(implicit - encoder: JsonEncoder[A] + encoder: JsonEncoder[A] ): LiftResponse = { implicit val prettify = params.prettify result @@ -243,20 +243,20 @@ object RudderJsonResponse { .runNow } def toLiftResponseOne(params: DefaultParams, schema: EndpointSchema, id: Option[String])(implicit - encoder: JsonEncoder[A] + encoder: JsonEncoder[A] ): LiftResponse = { toLiftResponseOne(params, ResponseSchema.fromSchema(schema), ConstIdTrace(id)) } def toLiftResponseOne(params: DefaultParams, schema: EndpointSchema, id: A => Option[String])(implicit - encoder: JsonEncoder[A] + encoder: JsonEncoder[A] ): LiftResponse = { toLiftResponseOne(params, ResponseSchema.fromSchema(schema), SuccessIdTrace(id)) } // when the computation give the response schema def toLiftResponseOneMap[B]( - params: DefaultParams, - errorSchema: ResponseSchema, - map: A => (ResponseSchema, B, Option[String]) + params: DefaultParams, + errorSchema: ResponseSchema, + map: A => (ResponseSchema, B, Option[String]) )(implicit encoder: JsonEncoder[B]): LiftResponse = { implicit val prettify = params.prettify result diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala index aece89af724..820dab3bae6 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala @@ -310,7 +310,7 @@ object Validation { } sealed trait Machine { - def tpe: MachineType + def tpe: MachineType final def name: String = tpe match { case PhysicalMachineType => "physical" case VirtualMachineType(UnknownVmType) => "vm" diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala index f11df08fe18..54015488dc9 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala @@ -99,7 +99,7 @@ class SharedFilesAPI( ) extends RestHelper with Loggable { private def checkPathAndContinue(path: String, baseFolder: File)( - fun: File => IOResult[LiftResponse] + fun: File => IOResult[LiftResponse] ): IOResult[LiftResponse] = { sanitizePath(path, baseFolder).flatMap(fun) } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala index 2b4ce350bf2..713b4f146d0 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala @@ -898,17 +898,17 @@ class ZipArchiveReaderImpl( } } def parseDirectives(arch: PolicyArchiveUnzip, directives: Chunk[(String, Array[Byte])])(implicit - dec: JsonDecoder[JRDirective] + dec: JsonDecoder[JRDirective] ): IOResult[PolicyArchiveUnzip] = { parseSimpleFile(arch, directives, modifyLens[PolicyArchiveUnzip](_.policies.directives), parseDirective) } def parseGroups(arch: PolicyArchiveUnzip, groups: Chunk[(String, Array[Byte])])(implicit - dec: JsonDecoder[JRGroup] + dec: JsonDecoder[JRGroup] ): IOResult[PolicyArchiveUnzip] = { parseSimpleFile(arch, groups, modifyLens[PolicyArchiveUnzip](_.policies.groups), parseGroup) } def parseRules(arch: PolicyArchiveUnzip, rules: Chunk[(String, Array[Byte])])(implicit - dec: JsonDecoder[JRRule] + dec: JsonDecoder[JRRule] ): IOResult[PolicyArchiveUnzip] = { parseSimpleFile(arch, rules, modifyLens[PolicyArchiveUnzip](_.policies.rules), parseRule) } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala index e0a445c0807..0118ffec0eb 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala @@ -569,7 +569,7 @@ class ComplianceAPIService( private[this] def components( nodeFacts: MapView[NodeId, CoreNodeFact] - )(name: String, nodeComponents: List[(NodeId, ComponentStatusReport)]): List[ByRuleComponentCompliance] = { + )(name: String, nodeComponents: List[(NodeId, ComponentStatusReport)]): List[ByRuleComponentCompliance] = { val (groupsComponents, uniqueComponents) = nodeComponents.partitionMap { case (a, b: BlockStatusReport) => Left((a, b)) @@ -616,7 +616,7 @@ class ComplianceAPIService( directives: Seq[Directive], allDirectives: Map[DirectiveId, (FullActiveTechnique, Directive)], // to compute policy mode for each rule level: Option[Int] - )(implicit qc: QueryContext): IOResult[Seq[ByDirectiveCompliance]] = { + )(implicit qc: QueryContext): IOResult[Seq[ByDirectiveCompliance]] = { val computedLevel = level.getOrElse(10) for { @@ -728,7 +728,7 @@ class ComplianceAPIService( * level 4 includes the nodes */ private[this] def getByRulesCompliance(rules: Seq[Rule], level: Option[Int])(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Seq[ByRuleRuleCompliance]] = { val computedLevel = level.getOrElse(10) @@ -880,14 +880,14 @@ class ComplianceAPIService( nodeGroupComplianceId: String, nodeGroupName: String, serverList: Set[NodeId], - allDirectives: Map[DirectiveId, (FullActiveTechnique, Directive)], - nodeFacts: MapView[NodeId, CoreNodeFact], - nodeSettings: Map[NodeId, RudderSettings], - rules: Seq[Rule], - allRuleInfos: Map[RuleId, (Chunk[NodeId], Option[PolicyMode])], - level: Option[Int], - isGlobalCompliance: Boolean - )(implicit qc: QueryContext): IOResult[ByNodeGroupCompliance] = { + allDirectives: Map[DirectiveId, (FullActiveTechnique, Directive)], + nodeFacts: MapView[NodeId, CoreNodeFact], + nodeSettings: Map[NodeId, RudderSettings], + rules: Seq[Rule], + allRuleInfos: Map[RuleId, (Chunk[NodeId], Option[PolicyMode])], + level: Option[Int], + isGlobalCompliance: Boolean + )(implicit qc: QueryContext): IOResult[ByNodeGroupCompliance] = { val ruleMap = rules.map(r => (r.id, r)).toMap val ruleIds = ruleMap.keySet @@ -1069,7 +1069,7 @@ class ComplianceAPIService( target: SimpleTarget, level: Option[Int], isGlobalCompliance: Boolean = true - )(implicit qc: QueryContext): Box[ByNodeGroupCompliance] = { + )(implicit qc: QueryContext): Box[ByNodeGroupCompliance] = { for { t1 <- currentTimeMillis nodeFacts <- nodeFactRepos.getAll() @@ -1327,8 +1327,8 @@ class ComplianceAPIService( rulesRepo.getAll() } private[this] def getByNodesCompliance( - onlyNode: Option[NodeId], - getRules: => IOResult[Seq[Rule]] + onlyNode: Option[NodeId], + getRules: => IOResult[Seq[Rule]] )(implicit qc: QueryContext): IOResult[Seq[ByNodeNodeCompliance]] = { for { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala index 4214667bcb2..0924278c396 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala @@ -108,26 +108,26 @@ class DirectiveApi( def schemas: ApiModuleProvider[API] = API def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit - action: String + action: String ): LiftResponse = { RestUtils.response(restExtractorService, dataName, id)(function, req, errorMessage) } type ActionType = RestUtils.ActionType def actionResponse(function: Box[ActionType], req: Req, errorMessage: String, id: Option[String], actor: EventActor)(implicit - action: String + action: String ): LiftResponse = { RestUtils.actionResponse2(restExtractorService, dataName, uuidGen, id)(function, req, errorMessage)(action, actor) } type WorkflowType = RestUtils.WorkflowType def workflowResponse( - function: Box[WorkflowType], - req: Req, - errorMessage: String, - id: Option[String], - defaultName: String, - actor: EventActor + function: Box[WorkflowType], + req: Req, + errorMessage: String, + id: Option[String], + defaultName: String, + actor: EventActor )(implicit action: String): LiftResponse = { RestUtils.workflowResponse2(restExtractorService, dataName, uuidGen, id)(function, req, errorMessage, defaultName)( action, @@ -450,7 +450,7 @@ class DirectiveApiService2( directive: Directive, initialState: Option[Directive], action: DGModAction - )(actor: EventActor, reason: Option[String], crName: String, crDescription: String): Box[JValue] = { + )(actor: EventActor, reason: Option[String], crName: String, crDescription: String): Box[JValue] = { val change = DirectiveChangeRequest( action, technique.id.name, @@ -510,7 +510,7 @@ class DirectiveApiService2( baseDirective: Directive, activeTechnique: ActiveTechnique, technique: Technique - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { val newDirective = restDirective.updateDirective(baseDirective) val modId = ModificationId(uuidGen.newUuid) for { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala index 2031a0907c5..98172371b45 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala @@ -268,13 +268,13 @@ class GroupsApi( import net.liftweb.json._ def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit - action: String + action: String ): LiftResponse = { RestUtils.response(restExtractorService, "groupCategories", id)(function, req, errorMessage) } def actionResponse(function: Box[ActionType], req: Req, errorMessage: String, id: Option[String], actor: EventActor)(implicit - action: String + action: String ): LiftResponse = { RestUtils.actionResponse2(restExtractorService, "groupCategories", uuidGen, id)(function, req, errorMessage)(action, actor) } @@ -705,22 +705,22 @@ class GroupApiService2( restExtractor: RestExtractorService, queryProcessor: QueryProcessor, restDataSerializer: RestDataSerializer -)(implicit userService: UserService) +)(implicit userService: UserService) extends Loggable { import RestUtils._ import restDataSerializer._ private[this] def createChangeRequestAndAnswer( - id: String, - diff: ChangeRequestNodeGroupDiff, - group: NodeGroup, - initialState: Option[NodeGroup], - newCategory: Option[NodeGroupCategoryId], - actor: EventActor, - req: Req, - act: DGModAction, - apiVersion: ApiVersion + id: String, + diff: ChangeRequestNodeGroupDiff, + group: NodeGroup, + initialState: Option[NodeGroup], + newCategory: Option[NodeGroupCategoryId], + actor: EventActor, + req: Req, + act: DGModAction, + apiVersion: ApiVersion )(implicit action: String, prettify: Boolean) = { val change = NodeGroupChangeRequest(act, group, newCategory, initialState) @@ -1006,7 +1006,7 @@ class GroupApiService6( def deleteCategory( id: NodeGroupCategoryId, apiVersion: ApiVersion - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { for { root <- readGroup.getFullGroupLibrary().toBox category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'" @@ -1021,7 +1021,7 @@ class GroupApiService6( id: NodeGroupCategoryId, restData: RestGroupCategory, apiVersion: ApiVersion - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { for { root <- readGroup.getFullGroupLibrary().toBox category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'" @@ -1039,7 +1039,7 @@ class GroupApiService6( defaultId: () => NodeGroupCategoryId, restData: RestGroupCategory, apiVersion: ApiVersion - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { for { update <- restData.create(defaultId) category = update.toNodeGroupCategory @@ -1267,7 +1267,7 @@ class GroupApiService14( def deleteCategory( id: NodeGroupCategoryId, apiVersion: ApiVersion - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { for { root <- readGroup.getFullGroupLibrary().toBox category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'" @@ -1282,7 +1282,7 @@ class GroupApiService14( id: NodeGroupCategoryId, restData: RestGroupCategory, apiVersion: ApiVersion - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { for { root <- readGroup.getFullGroupLibrary().toBox category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'" @@ -1300,7 +1300,7 @@ class GroupApiService14( defaultId: () => NodeGroupCategoryId, restData: RestGroupCategory, apiVersion: ApiVersion - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { for { update <- restData.create(defaultId) category = update.toNodeGroupCategory diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala index 4bd691e4de3..e45fc6e8b2c 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala @@ -149,12 +149,12 @@ trait LiftApiModuleProvider[A <: EndpointSchema] { } object LiftApiProcessingLogger extends Log { - protected def _logger: Logger = ApiLogger - def trace(msg: => String): Unit = _logger.trace(msg) - def debug(msg: => String): Unit = _logger.debug(msg) - def info(msg: => String): Unit = _logger.info(msg) - def warn(msg: => String): Unit = _logger.warn(msg) - def error(msg: => String): Unit = _logger.error(msg) + protected def _logger: Logger = ApiLogger + def trace(msg: => String): Unit = _logger.trace(msg) + def debug(msg: => String): Unit = _logger.debug(msg) + def info(msg: => String): Unit = _logger.info(msg) + def warn(msg: => String): Unit = _logger.warn(msg) + def error(msg: => String): Unit = _logger.error(msg) } class LiftHandler( diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala index 085f6b8101a..e7fb9f93cf7 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala @@ -572,8 +572,8 @@ class NodeApi( val schema: API.GetNodesStatus.type = API.GetNodesStatus val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { - implicit val action = "getNodeStatus" - implicit val prettify = params.prettify + implicit val action = "getNodeStatus" + implicit val prettify = params.prettify def errorMsg(ids: List[String]) = s"Error when trying to get status for nodes with IDs '${ids.mkString(",")}''" (for { ids <- (restExtractorService @@ -755,7 +755,7 @@ class NodeApiInheritedProperties( * Full list of node properties, including inherited ones for a node */ def getNodePropertiesTree(nodeId: NodeId, renderInHtml: RenderInheritedProperties)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[JValue] = { for { nodeInfo <- infoService.get(nodeId).notOptional(s"Node with ID '${nodeId.value}' was not found.'") @@ -1224,7 +1224,7 @@ class NodeApiService( } def property(req: Req, property: String, inheritedValue: Boolean)(implicit - qc: QueryContext + qc: QueryContext ): ZIO[Any, RudderError, LiftResponse] = { // import com.normation.rudder.facts.nodes.NodeFactSerialisation.SimpleCodec.codecNodeProperty @@ -1274,8 +1274,8 @@ class NodeApiService( } def modifyStatusFromAction( - ids: Seq[NodeId], - action: NodeStatusAction + ids: Seq[NodeId], + action: NodeStatusAction )(implicit cc: ChangeContext): Box[List[JValue]] = { def actualNodeDeletion(id: NodeId)(implicit cc: ChangeContext) = { for { @@ -1346,7 +1346,7 @@ class NodeApiService( nodeId: NodeId, detailLevel: NodeDetailLevel, state: InventoryStatus - )(implicit qc: QueryContext): IOResult[Option[JValue]] = { + )(implicit qc: QueryContext): IOResult[Option[JValue]] = { for { optNodeInfo <- nodeFactRepository.slowGetCompat(nodeId, state, SelectFacts.fromNodeDetailLevel(detailLevel)) nodeInfo <- optNodeInfo match { @@ -1370,8 +1370,8 @@ class NodeApiService( } def nodeDetailsGeneric(nodeId: NodeId, detailLevel: NodeDetailLevel)(implicit - prettify: Boolean, - qc: QueryContext + prettify: Boolean, + qc: QueryContext ): LiftResponse = { implicit val action = "nodeDetails" (for { @@ -1407,8 +1407,8 @@ class NodeApiService( def listNodes(state: InventoryStatus, detailLevel: NodeDetailLevel, nodeFilter: Option[Seq[NodeId]], version: ApiVersion)( implicit - prettify: Boolean, - qc: QueryContext + prettify: Boolean, + qc: QueryContext ): LiftResponse = { implicit val action = s"list${state.name.capitalize}Nodes" val predicate = (n: NodeFact) => { @@ -1462,8 +1462,8 @@ class NodeApiService( scoreService.getScoreDetails(nodeId) } def queryNodes(query: Query, state: InventoryStatus, detailLevel: NodeDetailLevel, version: ApiVersion)(implicit - prettify: Boolean, - qc: QueryContext + prettify: Boolean, + qc: QueryContext ): LiftResponse = { implicit val action = s"list${state.name.capitalize}Nodes" (for { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala index 26846f717b2..f6204e58cea 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala @@ -283,19 +283,19 @@ class ParameterApiService2( workflowLevelService: WorkflowLevelService, restExtractor: RestExtractorService, restDataSerializer: RestDataSerializer -)(implicit userService: UserService) +)(implicit userService: UserService) extends Loggable { import restDataSerializer.{serializeParameter => serialize} private[this] def createChangeRequestAndAnswer( - id: String, - diff: ChangeRequestGlobalParameterDiff, - parameter: GlobalParameter, - initialState: Option[GlobalParameter], - actor: EventActor, - req: Req, - act: GlobalParamModAction + id: String, + diff: ChangeRequestGlobalParameterDiff, + parameter: GlobalParameter, + initialState: Option[GlobalParameter], + actor: EventActor, + req: Req, + act: GlobalParamModAction )(implicit action: String, prettify: Boolean) = { val change = GlobalParamChangeRequest(act, initialState) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala index 614c6dcf097..09caa295b40 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala @@ -123,12 +123,12 @@ class RuleApi( } def actionResponse( - function: Box[ActionType], - req: Req, - errorMessage: String, - id: Option[String], - actor: EventActor, - dataName: String + function: Box[ActionType], + req: Req, + errorMessage: String, + id: Option[String], + actor: EventActor, + dataName: String )(implicit action: String): LiftResponse = { RestUtils.actionResponse2(restExtractorService, dataName, uuidGen, id)(function, req, errorMessage)(action, actor) } @@ -565,16 +565,16 @@ class RuleApiService2( workflowLevelService: WorkflowLevelService, restExtractor: RestExtractorService, restDataSerializer: RestDataSerializer -)(implicit userService: UserService) { +)(implicit userService: UserService) { import restDataSerializer.{serializeRule => serialize} private[this] def createChangeRequestAndAnswer( - id: String, - diff: ChangeRequestRuleDiff, - change: RuleChangeRequest, - actor: EventActor, - req: Req + id: String, + diff: ChangeRequestRuleDiff, + change: RuleChangeRequest, + actor: EventActor, + req: Req )(implicit action: String, prettify: Boolean) = { (for { workflow <- workflowLevelService.getForRule(actor, change) @@ -621,7 +621,7 @@ class RuleApiService2( def actualRuleCreation( change: RuleChangeRequest - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JArray] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JArray] = { (for { _ <- writeRule.create(change.newRule, modId, actor, reason).toBox } yield { @@ -806,7 +806,7 @@ class RuleApiService6( def updateCategory( id: RuleCategoryId, restData: RestRuleCategory - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { logger.info(restData) for { root <- readRuleCategory.getRootCategory() @@ -831,7 +831,7 @@ class RuleApiService6( def createCategory( restData: RestRuleCategory, defaultId: () => RuleCategoryId - )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { + )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = { for { name <- restData.name.notOptional("Could not create Rule Category, cause name is not defined").toBox update = RuleCategory(restData.id.getOrElse(defaultId()), name, restData.description.getOrElse(""), Nil) @@ -867,10 +867,10 @@ class RuleApiService14( val MISSING_RULE_CAT_ID: RuleCategoryId = RuleCategoryId("ui-missing-rule-category") private def createChangeRequest( - diff: ChangeRequestRuleDiff, - change: RuleChangeRequest, - params: DefaultParams, - actor: EventActor + diff: ChangeRequestRuleDiff, + change: RuleChangeRequest, + params: DefaultParams, + actor: EventActor )(implicit qc: QueryContext) = { for { workflow <- workflowLevelService.getForRule(actor, change).toIO @@ -940,11 +940,11 @@ class RuleApiService14( } def createRule( - restRule: JQRule, - ruleId: RuleId, - clone: Option[RuleId], - params: DefaultParams, - actor: EventActor + restRule: JQRule, + ruleId: RuleId, + clone: Option[RuleId], + params: DefaultParams, + actor: EventActor )(implicit qc: QueryContext): IOResult[JRRule] = { // decide if we should create a new rule or clone an existing one // Return the source rule to use in each case. diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala index b3880cc1076..b8ebe581169 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala @@ -283,7 +283,7 @@ class SettingsApi( toJson(value) } }.toBox - def set: (T, EventActor, Option[String]) => IOResult[Unit] + def set: (T, EventActor, Option[String]) => IOResult[Unit] def parseJson(json: JValue): Box[T] def parseParam(param: String): Box[T] type t = T @@ -352,22 +352,22 @@ class SettingsApi( case object RestPolicyMode extends RestSetting[PolicyMode] { val key = "global_policy_mode" val startPolicyGeneration = true - def get: IOResult[PolicyMode] = configService.rudder_policy_mode_name() - def set: (PolicyMode, EventActor, Option[String]) => IOResult[Unit] = configService.set_rudder_policy_mode_name _ - def toJson(value: PolicyMode): JValue = value.name - def parseJson(json: JValue): Box[PolicyMode] = { + def get: IOResult[PolicyMode] = configService.rudder_policy_mode_name() + def set: (PolicyMode, EventActor, Option[String]) => IOResult[Unit] = configService.set_rudder_policy_mode_name _ + def toJson(value: PolicyMode): JValue = value.name + def parseJson(json: JValue): Box[PolicyMode] = { json match { case JString(value) => PolicyMode.parse(value).toBox case x => Failure("Invalid value " + x) } } - def parseParam(param: String): Box[PolicyMode] = { + def parseParam(param: String): Box[PolicyMode] = { PolicyMode.parse(param) }.toBox } trait RestBooleanSetting extends RestSetting[Boolean] { - def toJson(value: Boolean): JValue = value + def toJson(value: Boolean): JValue = value def parseJson(json: JValue): Box[Boolean] = { json match { case JBool(value) => Full(value) @@ -384,7 +384,7 @@ class SettingsApi( } trait RestStringSetting extends RestSetting[String] { - def toJson(value: String): JValue = value + def toJson(value: String): JValue = value def parseJson(json: JValue): Box[String] = { json match { case JString(value) => Full(value) @@ -397,7 +397,7 @@ class SettingsApi( } trait RestIntSetting extends RestSetting[Int] { - def toJson(value: Int): JValue = value + def toJson(value: Int): JValue = value def parseJson(json: JValue): Box[Int] = { json match { case JInt(value) => Full(value.toInt) @@ -461,26 +461,26 @@ class SettingsApi( case object RestReportingMode extends RestSetting[ComplianceModeName] { val key = "reporting_mode" val startPolicyGeneration = true - def get: ZIO[Any, RudderError, ComplianceModeName] = for { + def get: ZIO[Any, RudderError, ComplianceModeName] = for { name <- configService.rudder_compliance_mode_name() mode <- ComplianceModeName.parse(name).toIO } yield { mode } - def set: (ComplianceModeName, EventActor, Option[String]) => IOResult[Unit] = { + def set: (ComplianceModeName, EventActor, Option[String]) => IOResult[Unit] = { (value: ComplianceModeName, actor: EventActor, reason: Option[String]) => configService.set_rudder_compliance_mode_name(value.name, actor, reason) } - def parseJson(json: JValue): Box[ComplianceModeName] = { + def parseJson(json: JValue): Box[ComplianceModeName] = { json match { case JString(value) => ComplianceModeName.parse(value) case x => Failure("Invalid value " + x) } } - def parseParam(param: String): Box[ComplianceModeName] = { + def parseParam(param: String): Box[ComplianceModeName] = { ComplianceModeName.parse(param) } - def toJson(value: ComplianceModeName): JValue = value.name + def toJson(value: ComplianceModeName): JValue = value.name } case object RestHeartbeat extends RestIntSetting { val startPolicyGeneration = true @@ -540,17 +540,17 @@ class SettingsApi( case object RestRelaySyncMethod extends RestSetting[RelaySynchronizationMethod] { val key = "relay_server_synchronization_method" val startPolicyGeneration = true - def get: IOResult[RelaySynchronizationMethod] = configService.relay_server_sync_method() - def set: (RelaySynchronizationMethod, EventActor, Option[String]) => IOResult[Unit] = + def get: IOResult[RelaySynchronizationMethod] = configService.relay_server_sync_method() + def set: (RelaySynchronizationMethod, EventActor, Option[String]) => IOResult[Unit] = (value: RelaySynchronizationMethod, _, _) => configService.set_relay_server_sync_method(value) - def toJson(value: RelaySynchronizationMethod): JValue = value.value - def parseJson(json: JValue): Box[RelaySynchronizationMethod] = { + def toJson(value: RelaySynchronizationMethod): JValue = value.value + def parseJson(json: JValue): Box[RelaySynchronizationMethod] = { json match { case JString(value) => parseParam(value.toLowerCase()) case x => Failure("Invalid value " + x) } } - def parseParam(param: String): Box[RelaySynchronizationMethod] = { + def parseParam(param: String): Box[RelaySynchronizationMethod] = { param.toLowerCase() match { case Classic.value => Full(Classic) case Rsync.value => Full(Rsync) @@ -577,17 +577,17 @@ class SettingsApi( case object RestReportProtocolDefault extends RestSetting[AgentReportingProtocol] { var key = "rudder_report_protocol_default" val startPolicyGeneration = false - def get: IOResult[AgentReportingProtocol] = configService.rudder_report_protocol_default() - def set: (AgentReportingProtocol, EventActor, Option[String]) => IOResult[Unit] = (value: AgentReportingProtocol, _, _) => + def get: IOResult[AgentReportingProtocol] = configService.rudder_report_protocol_default() + def set: (AgentReportingProtocol, EventActor, Option[String]) => IOResult[Unit] = (value: AgentReportingProtocol, _, _) => configService.set_rudder_report_protocol_default(value) - def toJson(value: AgentReportingProtocol): JValue = value.value - def parseJson(json: JValue): Box[AgentReportingProtocol] = { + def toJson(value: AgentReportingProtocol): JValue = value.value + def parseJson(json: JValue): Box[AgentReportingProtocol] = { json match { case JString(value) => parseParam(value.toUpperCase()) case x => Failure("Invalid value " + x) } } - def parseParam(param: String): Box[AgentReportingProtocol] = { + def parseParam(param: String): Box[AgentReportingProtocol] = { param.toUpperCase() match { case AgentReportingHTTPS.value => Full(AgentReportingHTTPS) case _ => Failure(s"Invalid value '${param}' for default reporting method") @@ -637,14 +637,14 @@ class SettingsApi( case object RestJSEngine extends RestSetting[FeatureSwitch] { val startPolicyGeneration = true - def toJson(value: FeatureSwitch): JValue = value.name - def parseJson(json: JValue): Box[FeatureSwitch] = { + def toJson(value: FeatureSwitch): JValue = value.name + def parseJson(json: JValue): Box[FeatureSwitch] = { json match { case JString(value) => FeatureSwitch.parse(value) case x => Failure("Invalid value " + x) } } - def parseParam(param: String): Box[FeatureSwitch] = { + def parseParam(param: String): Box[FeatureSwitch] = { FeatureSwitch.parse(param) } val key = "enable_javascript_directives" @@ -655,45 +655,45 @@ class SettingsApi( case object RestOnAcceptPolicyMode extends RestSetting[Option[PolicyMode]] { val startPolicyGeneration = false - def parseParam(value: String): Box[Option[PolicyMode]] = { + def parseParam(value: String): Box[Option[PolicyMode]] = { Full(PolicyMode.allModes.find(_.name == value)) } - def toJson(value: Option[PolicyMode]): JValue = JString(value.map(_.name).getOrElse("default")) - def parseJson(json: JValue): Box[Option[PolicyMode]] = { + def toJson(value: Option[PolicyMode]): JValue = JString(value.map(_.name).getOrElse("default")) + def parseJson(json: JValue): Box[Option[PolicyMode]] = { json match { case JString(value) => parseParam(value) case x => Failure("Invalid value " + x) } } val key = "node_onaccept_default_policyMode" - def get: IOResult[Option[PolicyMode]] = configService.rudder_node_onaccept_default_policy_mode() - def set: (Option[PolicyMode], EventActor, Option[String]) => IOResult[Unit] = (value: Option[PolicyMode], _, _) => + def get: IOResult[Option[PolicyMode]] = configService.rudder_node_onaccept_default_policy_mode() + def set: (Option[PolicyMode], EventActor, Option[String]) => IOResult[Unit] = (value: Option[PolicyMode], _, _) => configService.set_rudder_node_onaccept_default_policy_mode(value) } case object RestOnAcceptNodeState extends RestSetting[NodeState] { val startPolicyGeneration = false - def parseParam(value: String): Box[NodeState] = { + def parseParam(value: String): Box[NodeState] = { Full(NodeState.values.find(_.name == value).getOrElse(NodeState.Enabled)) } - def toJson(value: NodeState): JValue = value.name - def parseJson(json: JValue): Box[NodeState] = { + def toJson(value: NodeState): JValue = value.name + def parseJson(json: JValue): Box[NodeState] = { json match { case JString(value) => parseParam(value) case x => Failure("Invalid value " + x) } } val key = "node_onaccept_default_state" - def get: IOResult[NodeState] = configService.rudder_node_onaccept_default_state() - def set: (NodeState, EventActor, Option[String]) => IOResult[Unit] = (value: NodeState, _, _) => + def get: IOResult[NodeState] = configService.rudder_node_onaccept_default_state() + def set: (NodeState, EventActor, Option[String]) => IOResult[Unit] = (value: NodeState, _, _) => configService.set_rudder_node_onaccept_default_state(value) } trait RestChangeUnexpectedReportInterpretation extends RestBooleanSetting { def prop: UnexpectedReportBehavior - def get: ZIO[Any, RudderError, Boolean] = + def get: ZIO[Any, RudderError, Boolean] = configService.rudder_compliance_unexpected_report_interpretation().map(_.isSet(prop)) - def set: (Boolean, EventActor, Option[String]) => ZIO[Any, RudderError, Unit] = (value: Boolean, _, _) => { + def set: (Boolean, EventActor, Option[String]) => ZIO[Any, RudderError, Unit] = (value: Boolean, _, _) => { for { config <- configService.rudder_compliance_unexpected_report_interpretation() newConf = if (value) { @@ -720,7 +720,7 @@ class SettingsApi( } def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit - action: String + action: String ): LiftResponse = { RestUtils.response(restExtractorService, kind, id)(function, req, errorMessage) } @@ -767,15 +767,15 @@ class SettingsApi( case object RestGenerationDelay extends RestSetting[Duration] { val startPolicyGeneration = false val key = "rudder_generation_delay" - def get: IOResult[Duration] = configService.rudder_generation_delay() - def set: (Duration, EventActor, Option[String]) => IOResult[Unit] = (value: Duration, _, _) => + def get: IOResult[Duration] = configService.rudder_generation_delay() + def set: (Duration, EventActor, Option[String]) => IOResult[Unit] = (value: Duration, _, _) => configService.set_rudder_generation_delay(value) - def toJson(value: Duration): JValue = JString(value.toString) - def parseJson(json: JValue): Box[Duration] = json match { + def toJson(value: Duration): JValue = JString(value.toString) + def parseJson(json: JValue): Box[Duration] = json match { case JString(jstring) => parseParam(jstring) case _ => Failure(s"Could not extract a valid duration from ${net.liftweb.json.compactRender(json)}") } - def parseParam(param: String): Box[Duration] = net.liftweb.util.ControlHelpers.tryo(Duration(param)) match { + def parseParam(param: String): Box[Duration] = net.liftweb.util.ControlHelpers.tryo(Duration(param)) match { case eb: EmptyBox => eb ?~! s"Could not extract a valid duration from ${param}" case res => res } @@ -784,15 +784,15 @@ class SettingsApi( case object RestPolicyGenerationTrigger extends RestSetting[PolicyGenerationTrigger] { val startPolicyGeneration = false val key = "rudder_generation_policy" - def get: IOResult[PolicyGenerationTrigger] = configService.rudder_generation_trigger() - def set: (PolicyGenerationTrigger, EventActor, Option[String]) => IOResult[Unit] = (value: PolicyGenerationTrigger, _, _) => + def get: IOResult[PolicyGenerationTrigger] = configService.rudder_generation_trigger() + def set: (PolicyGenerationTrigger, EventActor, Option[String]) => IOResult[Unit] = (value: PolicyGenerationTrigger, _, _) => configService.set_rudder_generation_trigger(value) - def toJson(value: PolicyGenerationTrigger): JValue = JString(PolicyGenerationTrigger.serialize(value)) - def parseJson(json: JValue): Box[PolicyGenerationTrigger] = json match { + def toJson(value: PolicyGenerationTrigger): JValue = JString(PolicyGenerationTrigger.serialize(value)) + def parseJson(json: JValue): Box[PolicyGenerationTrigger] = json match { case JString(jstring) => parseParam(jstring) case _ => Failure(s"Could not extract a valid generation policy from ${net.liftweb.json.compactRender(json)}") } - def parseParam(value: String): Box[PolicyGenerationTrigger] = { + def parseParam(value: String): Box[PolicyGenerationTrigger] = { PolicyGenerationTrigger(value).toBox } } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala index ca26ad74dab..838d0489942 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala @@ -651,7 +651,7 @@ class SystemApiService11( itemArchiveManager: ItemArchiveManager, personIdentService: PersonIdentService, repo: GitRepositoryProvider -)(implicit userService: UserService) +)(implicit userService: UserService) extends Loggable { // The private methods are the internal behavior of the API. diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala index ebb500dcead..28575b3e5b2 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala @@ -114,7 +114,7 @@ class TechniqueApi( } def actionResp(function: Box[ActionType], req: Req, errorMessage: String, actor: EventActor)(implicit - action: String + action: String ): LiftResponse = { // implementation copied from RestUtils#actionResponse2 // but changed to never fail on reason message extraction diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala index 4dc6c1f963f..ea5695789fb 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala @@ -149,7 +149,7 @@ trait AuthenticatedUser { case RudderAccount.User(login, _) => login case RudderAccount.Api(api) => api.name.value }) - def nodePerms: NodeSecurityContext + def nodePerms: NodeSecurityContext def queryContext: QueryContext = { QueryContext(actor, nodePerms) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala index 7e60cb460ba..edf8d421cc4 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala @@ -231,7 +231,7 @@ trait SectionField extends SectionChildField { // - the user may not have choosen anything, so the default applied // - the user want to have the section displayed // - the user want to have the section hidden - var displayed: Option[Boolean] = Option.empty[Boolean] + var displayed: Option[Boolean] = Option.empty[Boolean] def collectVariables(onlyDirect: Boolean): Map[String, DirectiveField] = { childFields.flatMap { x => diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala index c5c2b1ccfe2..61e2ec22d87 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala @@ -92,7 +92,7 @@ import com.normation.utils.Utils.isEmpty import scala.collection.BitSet trait Perm { - def bits: BitSet + def bits: BitSet lazy val octal: Int = bitSetToInt(bits) def +(p: Perm): Perm = Perm(p.bits | bits) @@ -234,12 +234,12 @@ final case class PermSet(file: FilePerms, perms: (Perm => Unit, () => Perm)*) { def octal: String = perms.foldLeft("")((s, p) => s + p._2().octal.toString) // simule erad/write/exec vars - def read: Boolean = perms.foldLeft(true)((b, p) => b & p._2().read) - def read_=(b: Boolean): Unit = { if (b) this + (r) else this - (r) } - def write: Boolean = perms.foldLeft(true)((b, p) => b & p._2().write) - def write_=(b: Boolean): Unit = { if (b) this + (w) else this - (w) } - def exec: Boolean = perms.foldLeft(true)((b, p) => b & p._2().exec) - def exec_=(b: Boolean): Unit = { if (b) this + (x) else this - (x) } + def read: Boolean = perms.foldLeft(true)((b, p) => b & p._2().read) + def read_=(b: Boolean): Unit = { if (b) this + (r) else this - (r) } + def write: Boolean = perms.foldLeft(true)((b, p) => b & p._2().write) + def write_=(b: Boolean): Unit = { if (b) this + (w) else this - (w) } + def exec: Boolean = perms.foldLeft(true)((b, p) => b & p._2().exec) + def exec_=(b: Boolean): Unit = { if (b) this + (x) else this - (x) } } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/ComputePolicyMode.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/ComputePolicyMode.scala index 3912a243f18..478b24eab60 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/ComputePolicyMode.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/ComputePolicyMode.scala @@ -68,7 +68,7 @@ object ComputePolicyMode { } def directiveModeOnNode(nodeMode: Option[PolicyMode], globalMode: GlobalPolicyMode)( - directiveMode: Option[PolicyMode] + directiveMode: Option[PolicyMode] ): (String, String) = { globalMode.overridable match { case PolicyModeOverrides.Unoverridable => @@ -246,7 +246,7 @@ object ComputePolicyMode { // Used to compute mode applied on a Rule depending on the Node state and directive from the Rule // Used in compliance table in node page def ruleModeOnNode(nodeMode: Option[PolicyMode], globalMode: GlobalPolicyMode)( - directivesMode: Set[Option[PolicyMode]] + directivesMode: Set[Option[PolicyMode]] ): (String, String) = { val mixed = "This Rule has at least one Directive that will enforces configurations, and at least one that will audits them." @@ -256,7 +256,7 @@ object ComputePolicyMode { // Used to computed mode applied by a Node depending on it's mode and directive it applies // Used in Node compliance table in Rule page def nodeModeOnRule(nodeMode: Option[PolicyMode], globalMode: GlobalPolicyMode)( - directivesMode: Set[Option[PolicyMode]] + directivesMode: Set[Option[PolicyMode]] ): (String, String) = { val mixed = "This Node applies at least one Directive that will enforces configurations, and at least one that will audits them." @@ -266,7 +266,7 @@ object ComputePolicyMode { // Used to computed mode applied on a Directive depending on it's mode and and all Nodes appliying it // Used in Node compliance table in Rule page def directiveModeOnRule(nodeModes: Set[Option[PolicyMode]], globalMode: GlobalPolicyMode)( - directiveMode: Option[PolicyMode] + directiveMode: Option[PolicyMode] ): (String, String) = { val mixed = "This Directive is applied on at least one Node that will enforces configurations, and at least one that will audits them." diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala index 7bf66aef818..147dc3b3581 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala @@ -1166,8 +1166,8 @@ class EventLogDetailsGenerator( ): Option[NodeSeq] = diff.map(value => displayFormDiff(value, name)) private[this] def displayFormDiff[T]( - diff: SimpleDiff[T], - name: String + diff: SimpleDiff[T], + name: String )(implicit fun: T => String = (t: T) => t.toString): NodeSeq = { 
{fun(diff.oldValue)}
diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala index 7a3ca92fc0a..380d82d6441 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala @@ -221,21 +221,21 @@ class MockCompliance(mockDirectives: MockDirectives) { ).succeed } - def getNodeGroupCategory(id: NodeGroupId): IOResult[NodeGroupCategory] = ??? - def getAll(): IOResult[Seq[NodeGroup]] = ??? - def getAllByIds(ids: Seq[NodeGroupId]): IOResult[Seq[NodeGroup]] = ??? - def getAllNodeIds(): IOResult[Map[NodeGroupId, Set[NodeId]]] = ??? - def getGroupsByCategory(includeSystem: Boolean): IOResult[SortedMap[List[NodeGroupCategoryId], CategoryAndNodeGroup]] = ??? - def findGroupWithAnyMember(nodeIds: Seq[NodeId]): IOResult[Seq[NodeGroupId]] = ??? - def findGroupWithAllMember(nodeIds: Seq[NodeId]): IOResult[Seq[NodeGroupId]] = ??? - def getRootCategory(): NodeGroupCategory = ??? - def getRootCategoryPure(): IOResult[NodeGroupCategory] = ??? - def getCategoryHierarchy: IOResult[SortedMap[List[NodeGroupCategoryId], NodeGroupCategory]] = ??? - def getAllGroupCategories(includeSystem: Boolean): IOResult[Seq[NodeGroupCategory]] = ??? - def getGroupCategory(id: NodeGroupCategoryId): IOResult[NodeGroupCategory] = ??? - def getParentGroupCategory(id: NodeGroupCategoryId): IOResult[NodeGroupCategory] = ??? - def getParents_NodeGroupCategory(id: NodeGroupCategoryId): IOResult[List[NodeGroupCategory]] = ??? - def getAllNonSystemCategories(): IOResult[Seq[NodeGroupCategory]] = ??? + def getNodeGroupCategory(id: NodeGroupId): IOResult[NodeGroupCategory] = ??? + def getAll(): IOResult[Seq[NodeGroup]] = ??? + def getAllByIds(ids: Seq[NodeGroupId]): IOResult[Seq[NodeGroup]] = ??? + def getAllNodeIds(): IOResult[Map[NodeGroupId, Set[NodeId]]] = ??? + def getGroupsByCategory(includeSystem: Boolean): IOResult[SortedMap[List[NodeGroupCategoryId], CategoryAndNodeGroup]] = ??? + def findGroupWithAnyMember(nodeIds: Seq[NodeId]): IOResult[Seq[NodeGroupId]] = ??? + def findGroupWithAllMember(nodeIds: Seq[NodeId]): IOResult[Seq[NodeGroupId]] = ??? + def getRootCategory(): NodeGroupCategory = ??? + def getRootCategoryPure(): IOResult[NodeGroupCategory] = ??? + def getCategoryHierarchy: IOResult[SortedMap[List[NodeGroupCategoryId], NodeGroupCategory]] = ??? + def getAllGroupCategories(includeSystem: Boolean): IOResult[Seq[NodeGroupCategory]] = ??? + def getGroupCategory(id: NodeGroupCategoryId): IOResult[NodeGroupCategory] = ??? + def getParentGroupCategory(id: NodeGroupCategoryId): IOResult[NodeGroupCategory] = ??? + def getParents_NodeGroupCategory(id: NodeGroupCategoryId): IOResult[List[NodeGroupCategory]] = ??? + def getAllNonSystemCategories(): IOResult[Seq[NodeGroupCategory]] = ??? } private object nodeFactRepo extends NodeFactRepository { @@ -257,22 +257,22 @@ class MockCompliance(mockDirectives: MockDirectives) { ).map(n => (n.id, n)).toMap.view.succeed } - def registerChangeCallbackAction(callback: NodeFactChangeEventCallback): IOResult[Unit] = ??? - def getStatus(id: NodeId)(implicit qc: QueryContext): IOResult[InventoryStatus] = ??? - def get(nodeId: NodeId)(implicit qc: QueryContext, status: SelectNodeStatus): IOResult[Option[CoreNodeFact]] = ??? + def registerChangeCallbackAction(callback: NodeFactChangeEventCallback): IOResult[Unit] = ??? + def getStatus(id: NodeId)(implicit qc: QueryContext): IOResult[InventoryStatus] = ??? + def get(nodeId: NodeId)(implicit qc: QueryContext, status: SelectNodeStatus): IOResult[Option[CoreNodeFact]] = ??? def slowGet( - nodeId: NodeId + nodeId: NodeId )(implicit qc: QueryContext, status: SelectNodeStatus, attrs: SelectFacts): IOResult[Option[NodeFact]] = ??? - def getNodesbySofwareName(softName: String): IOResult[List[(NodeId, Software)]] = ??? - def slowGetAll()(implicit qc: QueryContext, status: SelectNodeStatus, attrs: SelectFacts): errors.IOStream[NodeFact] = ??? - def save(nodeFact: NodeFact)(implicit cc: ChangeContext, attrs: SelectFacts): IOResult[NodeFactChangeEventCC] = ??? + def getNodesbySofwareName(softName: String): IOResult[List[(NodeId, Software)]] = ??? + def slowGetAll()(implicit qc: QueryContext, status: SelectNodeStatus, attrs: SelectFacts): errors.IOStream[NodeFact] = ??? + def save(nodeFact: NodeFact)(implicit cc: ChangeContext, attrs: SelectFacts): IOResult[NodeFactChangeEventCC] = ??? def setSecurityTag(nodeId: NodeId, tag: Option[SecurityTag])(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? def updateInventory(inventory: FullInventory, software: Option[Iterable[Software]])(implicit - cc: ChangeContext + cc: ChangeContext ): IOResult[NodeFactChangeEventCC] = ??? - def changeStatus(nodeId: NodeId, into: InventoryStatus)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? - def delete(nodeId: NodeId)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? + def changeStatus(nodeId: NodeId, into: InventoryStatus)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? + def delete(nodeId: NodeId)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? } @@ -285,23 +285,23 @@ class MockCompliance(mockDirectives: MockDirectives) { rules.succeed } - override def getIds(includeSytem: Boolean): IOResult[Set[RuleId]] = ??? - override def create(rule: Rule, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[AddRuleDiff] = ??? + override def getIds(includeSytem: Boolean): IOResult[Set[RuleId]] = ??? + override def create(rule: Rule, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[AddRuleDiff] = ??? override def update( rule: Rule, modId: ModificationId, actor: EventActor, reason: Option[String] ): IOResult[Option[ModifyRuleDiff]] = ??? - override def load(rule: Rule, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[Unit] = ??? - override def unload(ruleId: RuleId, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[Unit] = ??? + override def load(rule: Rule, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[Unit] = ??? + override def unload(ruleId: RuleId, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[Unit] = ??? override def updateSystem( rule: Rule, modId: ModificationId, actor: EventActor, reason: Option[String] ): IOResult[Option[ModifyRuleDiff]] = ??? - override def delete(id: RuleId, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[DeleteRuleDiff] = + override def delete(id: RuleId, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[DeleteRuleDiff] = ??? override def deleteSystemRule( id: RuleId, @@ -309,13 +309,13 @@ class MockCompliance(mockDirectives: MockDirectives) { actor: EventActor, reason: Option[String] ): IOResult[DeleteRuleDiff] = ??? - override def swapRules(newRules: Seq[Rule]): IOResult[RuleArchiveId] = ??? - override def deleteSavedRuleArchiveId(saveId: RuleArchiveId): IOResult[Unit] = ??? + override def swapRules(newRules: Seq[Rule]): IOResult[RuleArchiveId] = ??? + override def deleteSavedRuleArchiveId(saveId: RuleArchiveId): IOResult[Unit] = ??? } private def reportingService(statusReports: Map[NodeId, NodeStatusReport]): ReportingService = new ReportingService { def findRuleNodeStatusReports(nodeIds: Set[NodeId], filterByRules: Set[RuleId])(implicit - qc: QueryContext + qc: QueryContext ): Box[Map[NodeId, NodeStatusReport]] = { val filteredNodeReports = statusReports.view.filterKeys(nodeIds.contains(_)).toMap Full( @@ -326,30 +326,30 @@ class MockCompliance(mockDirectives: MockDirectives) { def findDirectiveNodeStatusReports( nodeIds: Set[NodeId], filterByDirectives: Set[DirectiveId] - )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? + )(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? def findUncomputedNodeStatusReports(): Box[Map[NodeId, NodeStatusReport]] = ??? def findRuleNodeCompliance(nodeIds: Set[NodeId], filterByRules: Set[RuleId])(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, ComplianceLevel]] = ??? def findSystemAndUserRuleCompliances( nodeIds: Set[NodeId], filterBySystemRules: Set[RuleId], filterByUserRules: Set[RuleId] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? def findDirectiveRuleStatusReportsByRule(ruleId: RuleId)(implicit qc: QueryContext): IOResult[Map[NodeId, NodeStatusReport]] = ??? - def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? - def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? + def findNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + def findUserNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + def findSystemNodeStatusReport(nodeId: NodeId)(implicit qc: QueryContext): Box[NodeStatusReport] = ??? + def getUserNodeStatusReports()(implicit qc: QueryContext): Box[Map[NodeId, NodeStatusReport]] = ??? def findStatusReportsForDirective(directiveId: DirectiveId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Map[NodeId, NodeStatusReport]] = ??? def getSystemAndUserCompliance( optNodeIds: Option[Set[NodeId]] - )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? - def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = ??? - def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = ??? + )(implicit qc: QueryContext): IOResult[(Map[NodeId, ComplianceLevel], Map[NodeId, ComplianceLevel])] = ??? + def computeComplianceFromReports(reports: Map[NodeId, NodeStatusReport]): Option[(ComplianceLevel, Long)] = ??? + def getGlobalUserCompliance()(implicit qc: QueryContext): Box[Option[(ComplianceLevel, Long)]] = ??? } val complianceAPIService: ComplianceAPIService = { @@ -428,8 +428,8 @@ class MockCompliance(mockDirectives: MockDirectives) { val simpleCustomNodeGroups: List[NodeGroup] = List(g1, g2, g3) - private def nodeId(id: Int): NodeId = NodeId("n" + id) - private def ruleId(id: Int): RuleId = RuleId(RuleUid("r" + id)) + private def nodeId(id: Int): NodeId = NodeId("n" + id) + private def ruleId(id: Int): RuleId = RuleId(RuleUid("r" + id)) private def nodeGroupId(id: Int): NodeGroupId = NodeGroupId(NodeGroupUid("g" + id)) } @@ -583,8 +583,8 @@ class MockCompliance(mockDirectives: MockDirectives) { val complexCustomNodeGroups: List[NodeGroup] = List(g1, g2, g3, g4, g5, g6) // prefix all ids with "b" to avoid id collision with simpleExample - private def nodeId(id: Int): NodeId = NodeId("bn" + id) - private def ruleId(id: Int): RuleId = RuleId(RuleUid("br" + id)) + private def nodeId(id: Int): NodeId = NodeId("bn" + id) + private def ruleId(id: Int): RuleId = RuleId(RuleUid("br" + id)) private def nodeGroupId(id: Int): NodeGroupId = NodeGroupId(NodeGroupUid("bg" + id)) } diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala index 3906fd1098f..ac0bc47172d 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala @@ -235,7 +235,7 @@ class RestTestSetUp { new DynGroupUpdaterServiceImpl(mockNodeGroups.groupsRepo, mockNodeGroups.groupsRepo, mockNodes.queryProcessor) object dynGroupService extends DynGroupService { - override def getAllDynGroups(): Box[Seq[NodeGroup]] = { + override def getAllDynGroups(): Box[Seq[NodeGroup]] = { mockNodeGroups.groupsRepo .getFullGroupLibrary() .map(_.allGroups.collect { @@ -243,7 +243,7 @@ class RestTestSetUp { }.toSeq) .toBox } - override def changesSince(lastTime: DateTime): Box[Boolean] = Full(false) + override def changesSince(lastTime: DateTime): Box[Boolean] = Full(false) override def getAllDynGroupsWithandWithoutDependencies(): Box[(Seq[NodeGroupId], Seq[NodeGroupId])] = ??? } @@ -254,15 +254,15 @@ class RestTestSetUp { val eventLogRepo: EventLogRepository = new EventLogRepository { override def saveEventLog(modId: ModificationId, eventLog: EventLog): IOResult[EventLog] = eventLog.succeed - override def eventLogFactory: EventLogFactory = ??? + override def eventLogFactory: EventLogFactory = ??? override def getEventLogByCriteria( criteria: Option[Fragment], limit: Option[Int], orderBy: List[Fragment], extendedFilter: Option[Fragment] ): IOResult[Seq[EventLog]] = ??? - override def getEventLogById(id: Long): IOResult[EventLog] = ??? - override def getEventLogCount(criteria: Option[Fragment], extendedFilter: Option[Fragment]): IOResult[Long] = ??? + override def getEventLogById(id: Long): IOResult[EventLog] = ??? + override def getEventLogCount(criteria: Option[Fragment], extendedFilter: Option[Fragment]): IOResult[Long] = ??? override def getEventLogByChangeRequest( changeRequest: ChangeRequestId, xpath: String, @@ -270,7 +270,7 @@ class RestTestSetUp { orderBy: Option[String], eventTypeFilter: List[EventLogFilter] ): IOResult[Vector[EventLog]] = ??? - override def getEventLogWithChangeRequest(id: Int): IOResult[Option[(EventLog, Option[ChangeRequestId])]] = ??? + override def getEventLogWithChangeRequest(id: Int): IOResult[Option[(EventLog, Option[ChangeRequestId])]] = ??? override def getLastEventByChangeRequest( xpath: String, eventTypeFilter: List[EventLogFilter] @@ -301,33 +301,33 @@ class RestTestSetUp { override def getLastDeployement(): Box[CurrentDeploymentStatus] = Full(NoStatus) } val policyGeneration: PromiseGenerationService = new PromiseGenerationService { - override def deploy(): Box[Set[NodeId]] = Full(Set()) - override def getNodeFacts(): Box[MapView[NodeId, CoreNodeFact]] = ??? - override def getDirectiveLibrary(ids: Set[DirectiveId]): Box[FullActiveTechniqueCategory] = ??? - override def getGroupLibrary(): Box[FullNodeGroupCategory] = ??? - override def getAllGlobalParameters: Box[Seq[GlobalParameter]] = ??? - override def getGlobalComplianceMode(): Box[GlobalComplianceMode] = ??? - override def getGlobalAgentRun(): Box[AgentRunInterval] = ??? - override def getScriptEngineEnabled: () => Box[FeatureSwitch] = ??? - override def getGlobalPolicyMode: () => Box[GlobalPolicyMode] = ??? - override def getComputeDynGroups: () => Box[Boolean] = ??? - override def getMaxParallelism: () => Box[String] = ??? - override def getJsTimeout: () => Box[Int] = ??? - override def getGenerationContinueOnError: () => Box[Boolean] = ??? - override def writeCertificatesPem(allNodeInfos: MapView[NodeId, CoreNodeFact]): Unit = ??? - override def triggerNodeGroupUpdate(): Box[Unit] = ??? - override def beforeDeploymentSync(generationTime: DateTime): Box[Unit] = ??? - override def HOOKS_D: String = ??? - override def HOOKS_IGNORE_SUFFIXES: List[String] = ??? - override def UPDATED_NODE_IDS_PATH: String = ??? - override def GENERATION_FAILURE_MSG_PATH: String = ??? + override def deploy(): Box[Set[NodeId]] = Full(Set()) + override def getNodeFacts(): Box[MapView[NodeId, CoreNodeFact]] = ??? + override def getDirectiveLibrary(ids: Set[DirectiveId]): Box[FullActiveTechniqueCategory] = ??? + override def getGroupLibrary(): Box[FullNodeGroupCategory] = ??? + override def getAllGlobalParameters: Box[Seq[GlobalParameter]] = ??? + override def getGlobalComplianceMode(): Box[GlobalComplianceMode] = ??? + override def getGlobalAgentRun(): Box[AgentRunInterval] = ??? + override def getScriptEngineEnabled: () => Box[FeatureSwitch] = ??? + override def getGlobalPolicyMode: () => Box[GlobalPolicyMode] = ??? + override def getComputeDynGroups: () => Box[Boolean] = ??? + override def getMaxParallelism: () => Box[String] = ??? + override def getJsTimeout: () => Box[Int] = ??? + override def getGenerationContinueOnError: () => Box[Boolean] = ??? + override def writeCertificatesPem(allNodeInfos: MapView[NodeId, CoreNodeFact]): Unit = ??? + override def triggerNodeGroupUpdate(): Box[Unit] = ??? + override def beforeDeploymentSync(generationTime: DateTime): Box[Unit] = ??? + override def HOOKS_D: String = ??? + override def HOOKS_IGNORE_SUFFIXES: List[String] = ??? + override def UPDATED_NODE_IDS_PATH: String = ??? + override def GENERATION_FAILURE_MSG_PATH: String = ??? override def getAppliedRuleIds( rules: Seq[Rule], groupLib: FullNodeGroupCategory, directiveLib: FullActiveTechniqueCategory, allNodeInfos: MapView[NodeId, Boolean] ): Set[RuleId] = ??? - override def findDependantRules(): Box[Seq[Rule]] = ??? + override def findDependantRules(): Box[Seq[Rule]] = ??? override def buildRuleVals( activesRules: Set[RuleId], rules: Seq[Rule], @@ -344,7 +344,7 @@ class RestTestSetUp { globalComplianceMode: ComplianceMode, globalPolicyMode: GlobalPolicyMode ): Box[NodesContextResult] = ??? - override def getFilteredTechnique(): Map[NodeId, List[TechniqueName]] = ??? + override def getFilteredTechnique(): Map[NodeId, List[TechniqueName]] = ??? override def buildNodeConfigurations( activeNodeIds: Set[NodeId], ruleVals: Seq[RuleVal], @@ -357,8 +357,8 @@ class RestTestSetUp { jsTimeout: FiniteDuration, generationContinueOnError: Boolean ): Box[NodeConfigurations] = ??? - override def forgetOtherNodeConfigurationState(keep: Set[NodeId]): Box[Set[NodeId]] = ??? - override def getNodeConfigurationHash(): Box[Map[NodeId, NodeConfigurationHash]] = ??? + override def forgetOtherNodeConfigurationState(keep: Set[NodeId]): Box[Set[NodeId]] = ??? + override def getNodeConfigurationHash(): Box[Map[NodeId, NodeConfigurationHash]] = ??? override def getNodesConfigVersion( allNodeConfigs: Map[NodeId, NodeConfiguration], hashes: Map[NodeId, NodeConfigurationHash], @@ -379,8 +379,8 @@ class RestTestSetUp { generationTime: DateTime, allNodeModes: Map[NodeId, NodeModeConfig] ): List[NodeExpectedReports] = ??? - override def saveExpectedReports(expectedReports: List[NodeExpectedReports]): Box[Seq[NodeExpectedReports]] = ??? - override def runPreHooks(generationTime: DateTime, systemEnv: HookEnvPairs): Box[Unit] = ??? + override def saveExpectedReports(expectedReports: List[NodeExpectedReports]): Box[Seq[NodeExpectedReports]] = ??? + override def runPreHooks(generationTime: DateTime, systemEnv: HookEnvPairs): Box[Unit] = ??? override def runPostHooks( generationTime: DateTime, endTime: DateTime, @@ -395,7 +395,7 @@ class RestTestSetUp { errorMessage: String, errorMessagePath: String ): Box[Unit] = ??? - override def invalidateComplianceCache(actions: Seq[(NodeId, CacheExpectedReportAction)]): IOResult[Unit] = ??? + override def invalidateComplianceCache(actions: Seq[(NodeId, CacheExpectedReportAction)]): IOResult[Unit] = ??? } val bootGuard: Promise[Nothing, Unit] = (for { p <- Promise.make[Nothing, Unit] @@ -411,8 +411,8 @@ class RestTestSetUp { ) val findDependencies: FindDependencies = new FindDependencies { // never find any dependencies - override def findRulesForDirective(id: DirectiveUid): IOResult[Seq[Rule]] = Nil.succeed - override def findRulesForTarget(target: RuleTarget): IOResult[Seq[Rule]] = Nil.succeed + override def findRulesForDirective(id: DirectiveUid): IOResult[Seq[Rule]] = Nil.succeed + override def findRulesForTarget(target: RuleTarget): IOResult[Seq[Rule]] = Nil.succeed } val dependencyService = new DependencyAndDeletionServiceImpl( findDependencies, @@ -476,8 +476,8 @@ class RestTestSetUp { // all other apis class FakeClearCacheService extends ClearCacheService { - override def action(actor: EventActor): Box[String] = null - override def clearNodeConfigurationCache(storeEvent: Boolean, actor: EventActor): Box[Unit] = null + override def action(actor: EventActor): Box[String] = null + override def clearNodeConfigurationCache(storeEvent: Boolean, actor: EventActor): Box[Unit] = null } val fakeNotArchivedElements: NotArchivedElements = @@ -674,23 +674,22 @@ class RestTestSetUp { val fieldFactory: DirectiveFieldFactory = new DirectiveFieldFactory { override def forType(fieldType: VariableSpec, id: String): DirectiveField = default(id) - override def default(withId: String): DirectiveField = new DirectiveField { - self => - type ValueType = String + override def default(withId: String): DirectiveField = new DirectiveField { + self => type ValueType = String def manifest = manifestOf[String] lazy val id = withId def name = id - override val uniqueFieldId: Box[String] = Full(id) - protected var _x: String = getDefaultValue - def validate: List[FieldError] = Nil - def validations: List[String => List[FieldError]] = Nil - def setFilter: List[String => String] = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x - def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases + override val uniqueFieldId: Box[String] = Full(id) + protected var _x: String = getDefaultValue + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x + def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" def get = _x - def set(x: String) = { if (null == x) _x = "" else _x = x; _x } + def set(x: String) = { if (null == x) _x = "" else _x = x; _x } def toForm: Box[NodeSeq] = Full(SHtml.textarea("", s => parseClient(s))) } } @@ -1065,7 +1064,7 @@ class RestTest(liftRules: LiftRules) { mockReq } def GET(path: String): MockHttpServletRequest = mockRequest(path, "GET") - def POST(path: String): MockHttpServletRequest = mockRequest(path, "POST") + def POST(path: String): MockHttpServletRequest = mockRequest(path, "POST") def DELETE(path: String): MockHttpServletRequest = mockRequest(path, "DELETE") private[this] def mockJsonRequest(path: String, method: String, data: JValue) = { diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala index 70d0fed757c..e827688e103 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala @@ -305,13 +305,13 @@ trait TraitTestApiFromYamlFiles extends Specification with BoxSpecMatcher with J readYamlFiles(yamlSourceDirectory, yamlDestTmpDirectory, f => limitToFiles.exists(n => f.endsWith(n))).runNow } - def equalsBox[A](m: Matcher[A])(name: String): Matcher[Box[A]] = (_: Box[A]).mustMatch(m, name) + def equalsBox[A](m: Matcher[A])(name: String): Matcher[Box[A]] = (_: Box[A]).mustMatch(m, name) // Full(1) must equalsBoxStrict(1) - def equalsBoxStrict[A](a: A)(name: String): Matcher[Box[A]] = equalsBox[A](be_==(a))(name) + def equalsBoxStrict[A](a: A)(name: String): Matcher[Box[A]] = equalsBox[A](be_==(a))(name) // Full("[3,4]") must equalsBoxJson("[3, 4]") - def compareJson(s: String): Matcher[String] = + def compareJson(s: String): Matcher[String] = if (semanticJson) equalsJsonSemantic(s) else equalsJson(s) - def equalsBoxJson(s: String)(name: String): Matcher[Box[String]] = equalsBox(compareJson(s))(name) + def equalsBoxJson(s: String)(name: String): Matcher[Box[String]] = equalsBox(compareJson(s))(name) Fragments.foreach(files) { case (name, yamls) => diff --git a/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala b/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala index 387e848e53b..8ba67ee40e6 100644 --- a/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala +++ b/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala @@ -217,7 +217,7 @@ object TemplateCli { * inputExtension is replaced by outputExtension. */ def fill(variables: Seq[STVariable], outDir: File, inputExtension: String, outputExtension: String, timer: FillTemplateTimer)( - template: File + template: File ): IOResult[String] = { for { ok <- if (template.getName.endsWith(inputExtension)) { ZIO.unit } @@ -242,7 +242,7 @@ object TemplateCli { * Same as fill, but print everything to stdout */ def fillToStdout(variables: Seq[STVariable], inputExtension: String, timer: FillTemplateTimer)( - template: File + template: File ): IOResult[String] = { for { ok <- if (template.getName.endsWith(inputExtension)) { ZIO.unit } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala index 373de1e9f96..c27984ee08f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala @@ -582,9 +582,9 @@ object DefaultAuthBackendProvider extends AuthBackendsProvider { val FILE = "file" val ROOT_ADMIN = "rootAdmin" - override def authenticationBackends: Set[String] = Set(FILE, ROOT_ADMIN) - override def name: String = s"Default authentication backends provider: '${authenticationBackends.mkString("','")}" - override def allowedToUseBackend(name: String): Boolean = true // always enable - ie we never want to skip them + override def authenticationBackends: Set[String] = Set(FILE, ROOT_ADMIN) + override def name: String = s"Default authentication backends provider: '${authenticationBackends.mkString("','")}" + override def allowedToUseBackend(name: String): Boolean = true // always enable - ie we never want to skip them } // and default implementation: provides 'file', 'rootAdmin' @@ -678,7 +678,7 @@ class RestAuthenticationFilter( systemApiAcl: ApiAuthorization, apiTokenHeaderName: String = "X-API-Token" ) extends Filter with Loggable { - def destroy(): Unit = {} + def destroy(): Unit = {} def init(config: FilterConfig): Unit = {} private[this] val not_authenticated_api = List( diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala index 1d958b7593f..f724012fbd4 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala @@ -181,7 +181,7 @@ object Boot { * Returns all headers depending on page url, using current request nonce and add all other initial CSP directives */ private def replaceCSPRestrictionDirectives(key: String, value: String)( - directives: List[(String, String)] + directives: List[(String, String)] ): List[(String, String)] = { directives.map { case (k, _) if key == k => key -> value diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala index 55a0baa9846..7c4d9d8975f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala @@ -2307,7 +2307,7 @@ object RudderConfigInit { ) lazy val propertyEngineService = propertyEngineServiceImpl - def DN(rdn: String, parent: DN) = new DN(new RDN(rdn), parent) + def DN(rdn: String, parent: DN) = new DN(new RDN(rdn), parent) lazy val LDAP_BASEDN = new DN("cn=rudder-configuration") lazy val LDAP_INVENTORIES_BASEDN = DN("ou=Inventories", LDAP_BASEDN) lazy val LDAP_INVENTORIES_SOFTWARE_BASEDN = LDAP_INVENTORIES_BASEDN diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala index c8a279adabe..50d091462d5 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala @@ -118,7 +118,7 @@ object PasswordEncoder { } val PlainText: PasswordEncoder = new PasswordEncoder() { - override def encode(rawPassword: CharSequence): String = rawPassword.toString + override def encode(rawPassword: CharSequence): String = rawPassword.toString override def matches(rawPassword: CharSequence, encodedPassword: String): Boolean = rawPassword.toString == encodedPassword } // Unsalted hash functions : diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala index 32e6693a0a9..27cf8b54878 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala @@ -76,7 +76,7 @@ class MigrateChangeValidationEnforceSchema( // we need the table fragment to be the class method that can be overriden (e.g. for tests) private def transactMigration(table: String, tableFragment: Fragment, column: String)(implicit - xa: Transactor[Task] + xa: Transactor[Task] ): Task[Unit] = { val columnFragment = Fragment.const(column) for { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala index 6094fa38480..7e90ea68717 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala @@ -56,7 +56,7 @@ import scala.xml.NodeSeq * Component to display and configure the compliance Mode (and it's heartbeat) */ sealed trait ParseComplianceMode[T <: ComplianceMode] { - def isNodePage: Boolean + def isNodePage: Boolean def parseOverride(jsonMode: JObject): Box[Boolean] = { jsonMode.values.get("overrides") match { case Some(JBool(bool)) => Full(bool) @@ -136,7 +136,7 @@ class ComplianceModeEditForm[T <: ComplianceMode]( saveConfigureCallback: Function1[T, Box[Unit]], startNewPolicyGeneration: () => Unit, getGlobalConfiguration: Box[GlobalComplianceMode] -)(implicit p: ParseComplianceMode[T]) +)(implicit p: ParseComplianceMode[T]) extends DispatchSnippet with Loggable { // Html template diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala index b40dc8ed869..251160decce 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala @@ -84,7 +84,7 @@ class SearchNodeComponent( Noop }, // this callback is used when a research is done and the state of the Search button changes - saveButtonId: String = "", // the id of the save button, that gets disabled when one change the form + saveButtonId: String = "", // the id of the save button, that gets disabled when one change the form groupPage: Boolean ) extends DispatchSnippet with Loggable { @@ -592,7 +592,7 @@ object SearchNodeComponent { // how to present the first select box val otOptions: List[(String, String)] = { - val opts = Buffer[(String, String)]() + val opts = Buffer[(String, String)]() def add(s: String, pre: String = "") = opts += ((s, pre + S.?("ldap.object." + s))) add(OC_NODE) @@ -639,7 +639,7 @@ object SearchNodeComponent { SHtml.untrustedSelect( otOptions, Full(ot.objectType), - ({ x => + (x => { ditQueryData.criteriaMap.get(x) foreach { o => if (i >= 0 && i < lines.size) lines(i) = lines(i).copy(objectType = o) } }), ("id", "ot_" + i), diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala index f086b4e84ec..a29e3508441 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala @@ -194,7 +194,7 @@ class ShowNodeDetailsFromNode( } private[this] def privateDisplay(withinPopup: Boolean, displayDetailsMode: DisplayDetailsMode)(implicit - qr: QueryContext + qr: QueryContext ): NodeSeq = { nodeFactRepo.get(nodeId).toBox match { case Full(None) => @@ -264,7 +264,7 @@ class ShowNodeDetailsFromNode( withinPopup: Boolean, globalMode: GlobalPolicyMode, globalScore: GlobalScore - )(implicit qr: QueryContext): NodeSeq = { + )(implicit qr: QueryContext): NodeSeq = { val id = JsNodeId(nodeFact.id) val sm = nodeFact.toFullInventory val node = nodeFact.toCore diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala index b97b70699ff..d6e08bcb217 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala @@ -122,11 +122,11 @@ class TextField( override val uniqueFieldId: Full[String] = Full(id) def name = id - def validate: List[FieldError] = Nil - def validations: List[String => List[FieldError]] = Nil - def setFilter: List[String => String] = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" @@ -140,20 +140,20 @@ class ReadOnlyTextField(val id: String) extends DirectiveField { val readOnly = true def get = _x - def set(x: String): String = { if (null == x) _x = "" else _x = x; _x } - def toForm: Full[Elem] = { + def set(x: String): String = { if (null == x) _x = "" else _x = x; _x } + def toForm: Full[Elem] = { val attrs = if (isReadOnly) Seq(("readonly" -> "readonly")) else Seq() Full(SHtml.text(toClient, x => parseClient(x), attrs: _*)) } - def manifest: Manifest[String] = manifestOf[String] + def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) def name = id - def validate: List[FieldError] = Nil - def validations: List[String => List[FieldError]] = Nil - def setFilter: List[String => String] = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" @@ -277,8 +277,8 @@ class SelectOneField(val id: String, valueslabels: Seq[ValueLabel]) extends Dire private var _x: String = getDefaultValue def get = _x - def set(x: String): String = { if (null == x) _x = "" else _x = x; _x } - def toForm: Box[NodeSeq] = { + def set(x: String): String = { if (null == x) _x = "" else _x = x; _x } + def toForm: Box[NodeSeq] = { if (valueslabels.size <= 3) radios else @@ -306,11 +306,11 @@ class SelectOneField(val id: String, valueslabels: Seq[ValueLabel]) extends Dire override val uniqueFieldId: Full[String] = Full(id) def name = id - def validate: List[FieldError] = Nil - def validations: List[String => List[FieldError]] = Nil - def setFilter: List[String => String] = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x override def displayHtml: Text = { Text({ valueslabels.filter(entry => (entry.value == _x)).headOption.map(entry => entry.label).getOrElse("") }) @@ -380,8 +380,8 @@ class DateField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel private var _x: ValueType = getDefaultValue private var errors: List[FieldError] = Nil def get = _x - def set(x: ValueType): ValueType = { _x = x; _x } - def manifest: Manifest[LocalDate] = manifestOf[LocalDate] + def set(x: ValueType): ValueType = { _x = x; _x } + def manifest: Manifest[LocalDate] = manifestOf[LocalDate] override val uniqueFieldId: Full[String] = Full(id) @@ -419,8 +419,8 @@ class DateField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel Full(xml) } - def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases - def getDefaultValue: LocalDate = DateTime.now().toLocalDate // default datetime + def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases + def getDefaultValue: LocalDate = DateTime.now().toLocalDate // default datetime } class TimeField(format: DateTimeFormatter)(val id: String) extends DirectiveField { @@ -429,8 +429,8 @@ class TimeField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel private var _x: ValueType = getDefaultValue private var errors: List[FieldError] = Nil def get = _x - def set(x: ValueType): ValueType = { _x = x; _x } - def manifest: Manifest[LocalTime] = manifestOf[LocalTime] + def set(x: ValueType): ValueType = { _x = x; _x } + def manifest: Manifest[LocalTime] = manifestOf[LocalTime] override val uniqueFieldId: Full[String] = Full(id) @@ -468,20 +468,20 @@ class TimeField(format: DateTimeFormatter)(val id: String) extends DirectiveFiel Full(xml) } - def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases - def getDefaultValue: LocalTime = DateTime.now().toLocalTime // default datetime + def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases + def getDefaultValue: LocalTime = DateTime.now().toLocalTime // default datetime } class PeriodField(showSeconds: Boolean = true, showMinutes: Boolean = true, showHours: Boolean = true, showDays: Boolean = true)( - val id: String + val id: String ) extends DirectiveField { type ValueType = Period private var _x: ValueType = getDefaultValue private var errors: List[FieldError] = Nil def get = _x - def set(x: ValueType): ValueType = { _x = x; _x } - def manifest: Manifest[Period] = manifestOf[Period] + def set(x: ValueType): ValueType = { _x = x; _x } + def manifest: Manifest[Period] = manifestOf[Period] override val uniqueFieldId: Full[String] = Full(id) @@ -550,8 +550,8 @@ class FilePermsField(val id: String) extends DirectiveField { private val _x: ValueType = getDefaultValue def get = _x - def set(x: ValueType): ValueType = { _x.set(x); _x } - def manifest: Manifest[FilePerms] = manifestOf[FilePerms] + def set(x: ValueType): ValueType = { _x.set(x); _x } + def manifest: Manifest[FilePerms] = manifestOf[FilePerms] override val uniqueFieldId: Full[String] = Full(id) def name = id @@ -601,16 +601,16 @@ class CheckboxField(val id: String) extends DirectiveField { override def displayName_=(s: String): Unit = description = s def get = _x - def set(x: String): String = { if (null == x) _x = "" else _x = x; _x } - def manifest: Manifest[String] = manifestOf[String] + def set(x: String): String = { if (null == x) _x = "" else _x = x; _x } + def manifest: Manifest[String] = manifestOf[String] override val uniqueFieldId: Full[String] = Full(id) def name = id - def validate: List[FieldError] = Nil - def validations: List[String => List[FieldError]] = Nil - def setFilter: List[String => String] = Nil - def parseClient(s: String): Unit = if (null == s) _x = "false" else _x = s - def toClient: String = if (null == _x) "false" else _x + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "false" else _x = s + def toClient: String = if (null == _x) "false" else _x override def displayHtml: Text = { if ((null == _x) || ("false" == _x)) Text("No") else Text("Yes") } def toForm: Full[NodeSeq] = Full(SHtml.checkbox(toClient.equalsIgnoreCase("true"), x => parseClient(x.toString))) @@ -985,11 +985,11 @@ class FileField( override val uniqueFieldId: Full[String] = Full(id) def name = id - def validate: List[FieldError] = Nil - def validations: List[String => List[FieldError]] = Nil - def setFilter: List[String => String] = Nil - def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s - def toClient: String = if (null == _x) "" else _x + def validate: List[FieldError] = Nil + def validations: List[String => List[FieldError]] = Nil + def setFilter: List[String => String] = Nil + def parseClient(s: String): Unit = if (null == s) _x = "" else _x = s + def toClient: String = if (null == _x) "" else _x def getPossibleValues(filters: (ValueType => Boolean)*): Option[Set[ValueType]] = None // not supported in the general cases def getDefaultValue = "" diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala index 71124118b63..0d779d106da 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala @@ -230,8 +230,8 @@ class WBTextField(override val name: String, override val defaultValue: String = def inputField: Elem = SHtml.text(value, set _) - protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) - protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") + protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) + protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") def maxLen: Int = 50 } @@ -242,8 +242,8 @@ class WBTextAreaField(override val name: String, override val defaultValue: Stri def inputField: Elem = SHtml.textarea(value, set _) - protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) - protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") + protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) + protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") def maxLen: Int = 150 } @@ -276,9 +276,9 @@ class WBSelectField( def inputField: Elem = SHtml.select(opts, defaultVal, set _, attrs: _*) - protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) - protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") - def maxLen: Int = 150 + protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) + protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") + def maxLen: Int = 150 } @@ -337,7 +337,7 @@ class WBRadioField(
} - protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) - protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") - def maxLen: Int = 50 + protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) + protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") + def maxLen: Int = 50 } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala index 4ae1eb54843..9f2870fa118 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala @@ -124,9 +124,9 @@ class AsyncComplianceService( val nodeIds: Set[NodeId], val ruleIds: Set[RuleId] ) extends ComplianceBy[NodeId] { - def value(key: NodeId): String = key.value - val jsContainer: String = "nodeSystemCompliances" - def empty: Boolean = nodeIds.isEmpty + def value(key: NodeId): String = key.value + val jsContainer: String = "nodeSystemCompliances" + def empty: Boolean = nodeIds.isEmpty // Compute compliance def computeCompliance()(implicit qc: QueryContext): Box[Map[NodeId, Option[ComplianceLevel]]] = { @@ -146,9 +146,9 @@ class AsyncComplianceService( val nodeIds: Set[NodeId], val ruleIds: Set[RuleId] ) extends ComplianceBy[NodeId] { - def value(key: NodeId): String = key.value - val jsContainer: String = "nodeCompliances" - def empty: Boolean = nodeIds.isEmpty + def value(key: NodeId): String = key.value + val jsContainer: String = "nodeCompliances" + def empty: Boolean = nodeIds.isEmpty // Compute compliance def computeCompliance()(implicit qc: QueryContext): Box[Map[NodeId, Option[ComplianceLevel]]] = { @@ -169,9 +169,9 @@ class AsyncComplianceService( val nodeIds: Set[NodeId], val ruleIds: Set[RuleId] ) extends ComplianceBy[RuleId] { - def value(key: RuleId): String = key.serialize - val jsContainer: String = "ruleCompliances" - def empty: Boolean = ruleIds.isEmpty + def value(key: RuleId): String = key.serialize + val jsContainer: String = "ruleCompliances" + def empty: Boolean = ruleIds.isEmpty // Compute compliance def computeCompliance()(implicit qc: QueryContext): Box[Map[RuleId, Option[ComplianceLevel]]] = { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala index 1a116a00818..6cdf15bf8b2 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala @@ -124,8 +124,8 @@ object DisplayDirectiveTree extends Loggable { * keep. By default, display everything. */ def displayTree( - directiveLib: FullActiveTechniqueCategory, - globalMode: GlobalPolicyMode, // set of all directives at least used by one rule + directiveLib: FullActiveTechniqueCategory, + globalMode: GlobalPolicyMode, // set of all directives at least used by one rule // the int is the number of rule which used it usedDirectiveIds: Seq[(DirectiveUid, Int)], diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala index 1a00ee1c36d..e71feaf39e7 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala @@ -96,9 +96,9 @@ object DisplayNode extends Loggable { private[this] val uuidGen = RudderConfig.stringUuidGenerator private[this] val linkUtil = RudderConfig.linkUtil - private def escapeJs(in: String): JsExp = Str(escape(in)) - private def escapeHTML(in: String): NodeSeq = Text(escape(in)) - private def ?(in: Option[String]): NodeSeq = in.map(escapeHTML).getOrElse(NodeSeq.Empty) + private def escapeJs(in: String): JsExp = Str(escape(in)) + private def escapeHTML(in: String): NodeSeq = Text(escape(in)) + private def ?(in: Option[String]): NodeSeq = in.map(escapeHTML).getOrElse(NodeSeq.Empty) private def loadSoftware(jsId: JsNodeId)(nodeId: String): JsCmd = { implicit val attrs = SelectFacts.none.copy(software = SelectFacts.none.software.toRetrieve) @@ -380,7 +380,7 @@ object DisplayNode extends Loggable { nodeFact: NodeFact, globalMode: GlobalPolicyMode, salt: String = "" - )(implicit qc: QueryContext): NodeSeq = { + )(implicit qc: QueryContext): NodeSeq = { val jsId = JsNodeId(nodeFact.id, salt) val detailsId = htmlId(jsId, "details_") val sm = nodeFact.toFullInventory @@ -521,7 +521,7 @@ object DisplayNode extends Loggable { creationDate: Option[DateTime], salt: String = "", isDisplayingInPopup: Boolean = false - )(implicit qr: QueryContext): NodeSeq = { + )(implicit qr: QueryContext): NodeSeq = { val nodePolicyMode = { (globalMode.overridable, nodeFact.rudderSettings.policyMode) match { @@ -722,7 +722,7 @@ object DisplayNode extends Loggable { } - private def htmlId(jsId: JsNodeId, prefix: String): String = prefix + jsId.toString + private def htmlId(jsId: JsNodeId, prefix: String): String = prefix + jsId.toString private def htmlId_#(jsId: JsNodeId, prefix: String): String = "#" + prefix + jsId.toString // Display the role of the node @@ -791,7 +791,7 @@ object DisplayNode extends Loggable { } private def displayTabGrid[T]( - jsId: JsNodeId + jsId: JsNodeId )(eltName: String, optSeq: Box[Seq[T]], title: Option[String] = None)(columns: List[(String, T => NodeSeq)]) = {
{ optSeq match { @@ -910,10 +910,10 @@ object DisplayNode extends Loggable { private def displayTabNetworks(jsId: JsNodeId, sm: FullInventory): NodeSeq = { displayTabGrid(jsId)("net", Full(sm.node.networks)) { ("Interface", { (x: Network) => escapeHTML(x.name) }) :: - ("IP address", { (x: Network) => (x.ifAddresses.map { y => (
{escapeHTML(y.getHostAddress)}
) }): NodeSeq }) :: - ("Mask", { (x: Network) => (x.ifMask.map { y => (
{escapeHTML(y.getHostAddress)}
) }): NodeSeq }) :: - ("Network", { (x: Network) => (x.ifSubnet.map { y => (
{escapeHTML(y.getHostAddress)}
) }): NodeSeq }) :: - ("Gateway", { (x: Network) => (x.ifGateway.map { y => (
{escapeHTML(y.getHostAddress)}
) }): NodeSeq }) :: + ("IP address", { (x: Network) => (x.ifAddresses.map(y => (
{escapeHTML(y.getHostAddress)}
))): NodeSeq }) :: + ("Mask", { (x: Network) => (x.ifMask.map(y => (
{escapeHTML(y.getHostAddress)}
))): NodeSeq }) :: + ("Network", { (x: Network) => (x.ifSubnet.map(y => (
{escapeHTML(y.getHostAddress)}
))): NodeSeq }) :: + ("Gateway", { (x: Network) => (x.ifGateway.map(y => (
{escapeHTML(y.getHostAddress)}
))): NodeSeq }) :: ("DHCP server", { (x: Network) => escapeHTML(x.ifDhcp.map(_.getHostAddress).mkString(", ")) }) :: ("MAC address", { (x: Network) => ?(x.macAddress) }) :: ("Type", { (x: Network) => ?(x.ifType) }) :: diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala index c81798ea783..8d01dd0f091 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala @@ -96,7 +96,7 @@ final class NodeGrid( aoColumns: String = "", searchable: Boolean = true, paginate: Boolean = true - )(implicit qr: QueryContext): NodeSeq = { + )(implicit qr: QueryContext): NodeSeq = { display(servers, tableId, columns, aoColumns) ++ Script(initJs(tableId, columns, aoColumns, searchable, paginate)) } @@ -114,7 +114,7 @@ final class NodeGrid( aoColumns: String = "", searchable: Boolean, paginate: Boolean - )(implicit qr: QueryContext): JsCmd = { + )(implicit qr: QueryContext): JsCmd = { JsRaw(s""" var ${jsVarNameForId(tableId)}; @@ -222,7 +222,7 @@ final class NodeGrid( (if (isEmpty(server.hostname)) "(Missing host name) " + server.id.value else escape(server.hostname)) } & ".fullos *" #> escape(server.osFullName) & - ".ips *" #> ((server.ips.flatMap { ip =>
{escape(ip)}
}): NodeSeq) & // TODO : enhance this + ".ips *" #> ((server.ips.flatMap(ip =>
{escape(ip)}
)): NodeSeq) & // TODO : enhance this ".other" #> ((columns flatMap { c =>

}): NodeSeq) & ".nodetr [jsuuid]" #> { server.id.value.replaceAll("-", "") } & ".nodetr [nodeid]" #> { server.id.value } & diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala index 827552a2e9f..fb81669bfd9 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala @@ -45,7 +45,7 @@ import scala.xml.NodeSeq import scala.xml.Utility sealed trait ToastNotification { - def in: String + def in: String def message: String = Utility.escape(in).replaceAll("""\n""", " ") } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala index 680e77d496e..3f59f9caea8 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala @@ -258,7 +258,7 @@ class ParameterManagement extends DispatchSnippet with Loggable { } private[this] def workflowCallBack(action: GlobalParamModAction, workflowEnabled: Boolean)( - returns: Either[GlobalParameter, ChangeRequestId] + returns: Either[GlobalParameter, ChangeRequestId] ): JsCmd = { if ((!workflowEnabled) & (action == GlobalParamModAction.Delete)) { closePopup() & onSuccessDeleteCallback() diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala index e016e7afff0..ab00aa9fe94 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala @@ -152,8 +152,8 @@ class TestMigrateJsonTechniquesToYaml extends Specification with ContentMatchers gitMock.gitRepo, xmlPrettyPrinter, new GitModificationRepository { - override def getCommits(modificationId: ModificationId): IOResult[Option[GitCommitId]] = None.succeed - override def addCommit(commit: GitCommitId, modId: ModificationId): IOResult[DB.GitCommitJoin] = + override def getCommits(modificationId: ModificationId): IOResult[Option[GitCommitId]] = None.succeed + override def addCommit(commit: GitCommitId, modId: ModificationId): IOResult[DB.GitCommitJoin] = DB.GitCommitJoin(commit, modId).succeed }, new TrivialPersonIdentService(), diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala index 71b9d994063..8f974eb2849 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala @@ -176,7 +176,7 @@ trait TestMigrateNodeAcceptationInventories extends Specification with AfterAll val root: File = testDir / "migrated" root.createDirectories() - def nodeDir(nodeId: NodeId): File = root / nodeId.value + def nodeDir(nodeId: NodeId): File = root / nodeId.value def factFile(nodeId: NodeId, date: DateTime): File = { nodeDir(nodeId) / (dateFormat.print(date) + ".json") } @@ -255,8 +255,8 @@ trait TestMigrateNodeAcceptationInventories extends Specification with AfterAll val n = NodeConfigData.node1 def success(nodeId: NodeId): ZIO[Any, Nothing, Some[NodeInfo]] = Some(n.modify(_.node.id).setTo(nodeId)).succeed - override def getAll(): IOResult[Map[NodeId, NodeInfo]] = ??? - override def getNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]] = nodeId.value match { + override def getAll(): IOResult[Map[NodeId, NodeInfo]] = ??? + override def getNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]] = nodeId.value match { case "0afa1d13-d125-4c91-9d71-24c47dc867e9" => None.succeed case "0bd58a1f-3faa-4783-a7a2-52d84021663a" => success(nodeId) case "1bd58a1f-3faa-4783-a7a2-52d84021663a" => success(nodeId) @@ -265,14 +265,14 @@ trait TestMigrateNodeAcceptationInventories extends Specification with AfterAll case "fb0096f3-a928-454d-9776-e8079d48cdd8" => None.succeed case "fb0096f4-a928-454d-9776-e8079d48cdd8" => None.succeed } - override def getNodeInfosSeq(nodesId: Seq[NodeId]): IOResult[Seq[NodeInfo]] = ??? - override def getNumberOfManagedNodes: IOResult[Int] = ??? - override def getAllNodesIds(): IOResult[Set[NodeId]] = ??? - override def getAllNodes(): IOResult[Map[NodeId, Node]] = ??? - override def getAllSystemNodeIds(): IOResult[Seq[NodeId]] = ??? - override def getPendingNodeInfos(): IOResult[Map[NodeId, NodeInfo]] = ??? - override def getPendingNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]] = ??? - override def getAllNodeInfos(): IOResult[Seq[NodeInfo]] = ??? + override def getNodeInfosSeq(nodesId: Seq[NodeId]): IOResult[Seq[NodeInfo]] = ??? + override def getNumberOfManagedNodes: IOResult[Int] = ??? + override def getAllNodesIds(): IOResult[Set[NodeId]] = ??? + override def getAllNodes(): IOResult[Map[NodeId, Node]] = ??? + override def getAllSystemNodeIds(): IOResult[Seq[NodeId]] = ??? + override def getPendingNodeInfos(): IOResult[Map[NodeId, NodeInfo]] = ??? + override def getPendingNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]] = ??? + override def getAllNodeInfos(): IOResult[Seq[NodeInfo]] = ??? } lazy val migration = new MigrateNodeAcceptationInventories(nodeInfoService, null, fileLog, testFactLog, 365.days) diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala index 64f6eb9b517..6d987c826ee 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala @@ -67,9 +67,9 @@ trait LDIFFileLogger { class DummyLDIFFileLogger extends LDIFFileLogger { def loggerName = "dummy logger - no output" val ldifTraceRootDir = "no a real ldifTraceRootDir" - def tree(tree: LDAPTree): Unit = {} - def record(LDIFRecord: => LDIFRecord, comment: Option[String] = None): Unit = {} - def records(LDIFRecords: => Seq[LDIFRecord]): Unit = {} + def tree(tree: LDAPTree): Unit = {} + def record(LDIFRecord: => LDIFRecord, comment: Option[String] = None): Unit = {} + def records(LDIFRecords: => Seq[LDIFRecord]): Unit = {} } /** @@ -88,9 +88,9 @@ class DefaultLDIFFileLogger( override val loggerName: String = DefaultLDIFFileLogger.defaultLoggerName, override val ldifTraceRootDir: String = DefaultLDIFFileLogger.defaultTraceDir ) extends Slf4jLDIFLogger { - override def isLogLevel: Boolean = logger.isTraceEnabled - override def log(s: String): Unit = logger.trace(s) - override def logE(s: String, e: Exception): Unit = logger.trace(s, e) + override def isLogLevel: Boolean = logger.isTraceEnabled + override def log(s: String): Unit = logger.trace(s) + override def logE(s: String, e: Exception): Unit = logger.trace(s, e) } /** diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala index 71f3212224e..c41443524be 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala @@ -510,7 +510,7 @@ class RwLDAPConnection( toLDIFChangeRecord: MOD => LDIFChangeRecord, backendAction: MOD => LDAPResult, onlyReportThat: ResultCode => Boolean - )(reqs: List[MOD]): LDAPIOResult[Seq[LDIFChangeRecord]] = { + )(reqs: List[MOD]): LDAPIOResult[Seq[LDIFChangeRecord]] = { if (reqs.isEmpty) ZIO.succeed(Seq()) else { ZIO.succeed(ldifFileLogger.records(reqs map (toLDIFChangeRecord(_)))) *> @@ -533,7 +533,7 @@ class RwLDAPConnection( toLDIFChangeRecord: MOD => LDIFChangeRecord, backendAction: MOD => LDAPResult, onlyReportThat: ResultCode => Boolean - )(req: MOD): LDAPIOResult[LDIFChangeRecord] = { + )(req: MOD): LDAPIOResult[LDIFChangeRecord] = { val record = toLDIFChangeRecord(req) ZIO .blocking(blocking { diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala index 57b52b9a725..7ecd7077c53 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala @@ -106,7 +106,7 @@ trait LDAPConnectionProvider[LDAP <: RoLDAPConnection] { * display in log message (for example). * Implementations: DO NOT provide sensitive information here. */ - override def toString: String = toConnectionString + override def toString: String = toConnectionString def toConnectionString: String /* @@ -200,7 +200,7 @@ trait OneConnectionProvider[LDAP <: RoLDAPConnection] extends LDAPConnectionProv } yield ()) } - protected def getInternalConnection: LDAPIOResult[LDAP] = { + protected def getInternalConnection: LDAPIOResult[LDAP] = { semaphore.withPermit(for { c <- connection.get n <- (c match { @@ -217,8 +217,8 @@ trait OneConnectionProvider[LDAP <: RoLDAPConnection] extends LDAPConnectionProv n }) } - override protected def releaseInternalConnection(con: LDAP): UIO[Unit] = ZIO.unit - override protected def releaseDefuncInternalConnection(con: LDAP): UIO[Unit] = ZIO.unit + override protected def releaseInternalConnection(con: LDAP): UIO[Unit] = ZIO.unit + override protected def releaseDefuncInternalConnection(con: LDAP): UIO[Unit] = ZIO.unit } /** diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala index 9b99c914326..6274ec921a8 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala @@ -192,20 +192,20 @@ class LDAPEntry(private val _backed: UnboundidEntry) { ////// Methods to retrieve the first value of attribute in typed way ////// - def getAsBoolean(attributeName: String): Option[Boolean] = _backed.getAttributeValueAsBoolean(attributeName) match { + def getAsBoolean(attributeName: String): Option[Boolean] = _backed.getAttributeValueAsBoolean(attributeName) match { case null => None case b => Some(b.booleanValue) } - def getAsDate(attributeName: String): Option[java.util.Date] = _backed.getAttributeValueAsDate(attributeName) match { + def getAsDate(attributeName: String): Option[java.util.Date] = _backed.getAttributeValueAsDate(attributeName) match { case null => None case x => Some(x) } - def getAsGTime(attributeName: String): Option[GeneralizedTime] = apply(attributeName) flatMap { x => GeneralizedTime.parse(x) } - def getAsDn(attributeName: String): Option[DN] = _backed.getAttributeValueAsDN(attributeName) match { + def getAsGTime(attributeName: String): Option[GeneralizedTime] = apply(attributeName) flatMap { x => GeneralizedTime.parse(x) } + def getAsDn(attributeName: String): Option[DN] = _backed.getAttributeValueAsDN(attributeName) match { case null => None case x => Some(x) } - def getAsInt(attributeName: String): Option[Int] = _backed.getAttributeValueAsInteger(attributeName) match { + def getAsInt(attributeName: String): Option[Int] = _backed.getAttributeValueAsInteger(attributeName) match { case null => None case x => Some(x.intValue) } @@ -260,9 +260,9 @@ class LDAPEntry(private val _backed: UnboundidEntry) { ////// Standard methods (toString/equal etc) and LDIF method ////// override def toString() = _backed.toString - def toLDIFString(sb: java.lang.StringBuilder): Unit = _backed.toLDIFString(sb) - def toLDIFString(): String = _backed.toLDIFString() - def toLDIFRecord: LDIFRecord = _backed + def toLDIFString(sb: java.lang.StringBuilder): Unit = _backed.toLDIFString(sb) + def toLDIFString(): String = _backed.toLDIFString() + def toLDIFRecord: LDIFRecord = _backed /* * A set which take an option, and remove the given attribute @@ -294,9 +294,9 @@ object LDAPEntry { */ val logger: Logger = LoggerFactory.getLogger(classOf[LDAPEntry]) - def apply(e: UnboundidEntry): LDAPEntry = new LDAPEntry(e.duplicate()) // val e = LDAPEntry(unboundidEntry) - def apply(dn: DN, attributes: Attribute*): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes: _*)) - def apply(dn: DN, attributes: Iterable[Attribute]): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes.toSeq: _*)) + def apply(e: UnboundidEntry): LDAPEntry = new LDAPEntry(e.duplicate()) // val e = LDAPEntry(unboundidEntry) + def apply(dn: DN, attributes: Attribute*): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes: _*)) + def apply(dn: DN, attributes: Iterable[Attribute]): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes.toSeq: _*)) def apply(rdnAttribute: String, rdnValue: String, parentDn: String, attributes: Attribute*): LDAPEntry = { require(rdnValue != null && rdnValue.nonEmpty) apply(new DN(s"${rdnAttribute}=${rdnValue},${parentDn}"), attributes) diff --git a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala index b5599250dbc..6f66ce6adf7 100644 --- a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala +++ b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala @@ -46,8 +46,7 @@ class LDAPTreeTest extends Specification { override val root = LDAPEntry(dn1) val c1 = new LDAPTree() { - tree_c1 => - override val root = LDAPEntry(dn2) + tree_c1 => override val root = LDAPEntry(dn2) top.addChild(tree_c1) } diff --git a/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala b/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala index c678c07b227..25d163c01e1 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala @@ -176,7 +176,7 @@ object errors { trait BaseChainError[E <: RudderError] extends RudderError { def cause: E def hint: String - def msg: String = s"${hint}; cause was: ${cause.fullMsg}" + def msg: String = s"${hint}; cause was: ${cause.fullMsg}" } final case class Chained[E <: RudderError](hint: String, cause: E) extends BaseChainError[E] { @@ -451,9 +451,9 @@ object zio { * When porting a class is too hard */ implicit class UnsafeRun[A](io: IOResult[A]) { - def runNow: A = ZioRuntime.runNow(io) + def runNow: A = ZioRuntime.runNow(io) def runNowLogError(logger: RudderError => Unit): Unit = ZioRuntime.runNowLogError(logger)(io) - def runOrDie(throwEx: RudderError => Throwable): A = ZioRuntime.runNow(io.either) match { + def runOrDie(throwEx: RudderError => Throwable): A = ZioRuntime.runNow(io.either) match { case Right(a) => a case Left(err) => throw throwEx(err) } @@ -544,9 +544,9 @@ trait ZioLogger { final def trace(msg: => String): UIO[Unit] = ZIO.when(logEffect.isTraceEnabled())(logAndForgetResult(_.trace(msg))).unit final def debug(msg: => String): UIO[Unit] = ZIO.when(logEffect.isDebugEnabled())(logAndForgetResult(_.debug(msg))).unit - final def info(msg: => String): UIO[Unit] = ZIO.when(logEffect.isInfoEnabled())(logAndForgetResult(_.info(msg))).unit + final def info(msg: => String): UIO[Unit] = ZIO.when(logEffect.isInfoEnabled())(logAndForgetResult(_.info(msg))).unit final def error(msg: => String): UIO[Unit] = ZIO.when(logEffect.isErrorEnabled())(logAndForgetResult(_.error(msg))).unit - final def warn(msg: => String): UIO[Unit] = ZIO.when(logEffect.isWarnEnabled())(logAndForgetResult(_.warn(msg))).unit + final def warn(msg: => String): UIO[Unit] = ZIO.when(logEffect.isWarnEnabled())(logAndForgetResult(_.warn(msg))).unit final def trace(msg: => String, t: Throwable): UIO[Unit] = ZIO.when(logEffect.isTraceEnabled())(logAndForgetResult(_.trace(msg, t))).unit @@ -561,8 +561,8 @@ trait ZioLogger { final def ifTraceEnabled[T](action: UIO[T]): UIO[Unit] = ZIO.when(logEffect.isTraceEnabled())(action).unit final def ifDebugEnabled[T](action: UIO[T]): UIO[Unit] = ZIO.when(logEffect.isDebugEnabled())(action).unit - final def ifInfoEnabled[T](action: UIO[T]): UIO[Unit] = ZIO.when(logEffect.isInfoEnabled())(action).unit - final def ifWarnEnabled[T](action: UIO[T]): UIO[Unit] = ZIO.when(logEffect.isErrorEnabled())(action).unit + final def ifInfoEnabled[T](action: UIO[T]): UIO[Unit] = ZIO.when(logEffect.isInfoEnabled())(action).unit + final def ifWarnEnabled[T](action: UIO[T]): UIO[Unit] = ZIO.when(logEffect.isErrorEnabled())(action).unit final def ifErrorEnabled[T](action: UIO[T]): UIO[Unit] = ZIO.when(logEffect.isWarnEnabled())(action).unit } diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala index efabd268905..e15d1a17f59 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala @@ -46,7 +46,7 @@ object CronParser { type State = Unit def initial: Unit = () def step(now: OffsetDateTime, in: Any, state: Unit)(implicit - trace: Trace + trace: Trace ): ZIO[Any, Nothing, (Unit, Any, Schedule.Decision)] = { ZIO.succeed((c.next(now))).map { case Some(next) => (initial, in, Schedule.Decision.Continue(Schedule.Interval.after(next))) diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/StandardFieldsValidation.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/StandardFieldsValidation.scala index a714686b329..0c98c3124c2 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/StandardFieldsValidation.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/StandardFieldsValidation.scala @@ -26,7 +26,7 @@ import java.util.regex.Pattern trait RegexValidation { def stringPattern: String - lazy val pattern: Pattern = Pattern.compile(stringPattern) + lazy val pattern: Pattern = Pattern.compile(stringPattern) def isValid(candidate: String): Boolean = pattern.matcher(candidate).matches } diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala index 58b5065182b..ea41da5ef9e 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala @@ -83,9 +83,9 @@ final case class Version(epoch: Long, head: PartType, parts: List[VersionPart]) object Version { // create a list of default value, ie a list of ".0", of the given size - def defaultList(size: Int): List[VersionPart.After] = List.fill(size)(VersionPart.After(Separator.Dot, PartType.Numeric(0))) + def defaultList(size: Int): List[VersionPart.After] = List.fill(size)(VersionPart.After(Separator.Dot, PartType.Numeric(0))) @scala.annotation.tailrec - def compareList(a: List[VersionPart], aInitSize: Int, b: List[VersionPart], bInitSize: Int): Int = { + def compareList(a: List[VersionPart], aInitSize: Int, b: List[VersionPart], bInitSize: Int): Int = { (a, b) match { case (Nil, Nil) => aInitSize - bInitSize @@ -96,7 +96,7 @@ object Version { if (h == 0) compareList(t1, aInitSize, t2, bInitSize) else h } } - def compare(a: Version, b: Version): Int = { + def compare(a: Version, b: Version): Int = { val e = a.epoch - b.epoch if (e == 0L) { val h = PartType.compare(a.head, b.head) @@ -155,8 +155,8 @@ object PartType { object Numeric { // with software in node, we have zillion of duplication of numeric of low ran, so we store them here: val cacheSize = 100 - val numCache: Chunk[Numeric] = Chunk.fromIterable((0 until cacheSize).map(i => new Numeric(i.toLong))) - def apply(n: Long): Numeric = if (n < cacheSize) numCache(n.toInt) else new Numeric(n) + val numCache: Chunk[Numeric] = Chunk.fromIterable((0 until cacheSize).map(i => new Numeric(i.toLong))) + def apply(n: Long): Numeric = if (n < cacheSize) numCache(n.toInt) else new Numeric(n) } def compare(a: PartType, b: PartType): Int = { val d = a.index - b.index @@ -174,8 +174,8 @@ sealed trait VersionPart extends ToVersionString with Ordered[VersionPart] { def separator: Separator def value: PartType - override def toVersionString: String = separator.toVersionString + value.toVersionString - override def compare(other: VersionPart): Int = VersionPart.compare(this, other) + override def toVersionString: String = separator.toVersionString + value.toVersionString + override def compare(other: VersionPart): Int = VersionPart.compare(this, other) } object VersionPart { @@ -196,13 +196,13 @@ object ParseVersion { import fastparse._ import fastparse.NoWhitespace._ - def ascii: CharsetEncoder = Charset.forName("US-ASCII").newEncoder() + def ascii: CharsetEncoder = Charset.forName("US-ASCII").newEncoder() // chars allowed in a version. Only ascii, non control, non space, non separator - including ":" used for epoch - def versionChar(c: Char): Boolean = + def versionChar(c: Char): Boolean = ascii.canEncode(c) && !(c.isDigit || c.isControl || c.isSpaceChar || separatorChar(c) || c == ':') - def separatorChar(c: Char): Boolean = List('~', '+', ',', '-', '.').contains(c) + def separatorChar(c: Char): Boolean = List('~', '+', ',', '-', '.').contains(c) - def num[A: P]: P[Long] = P(CharIn("0-9").rep(1).!.map(_.toLong)) + def num[A: P]: P[Long] = P(CharIn("0-9").rep(1).!.map(_.toLong)) def chars[A: P]: P[PartType] = P(CharsWhile(versionChar).rep(1).!).map { s => import PartType._ s.toLowerCase match { @@ -216,8 +216,8 @@ object ParseVersion { } } - def epoch[A: P]: P[Long] = P(num ~ ":") - def toSeparator(c: Char): Separator = { + def epoch[A: P]: P[Long] = P(num ~ ":") + def toSeparator(c: Char): Separator = { c match { case '~' => Separator.Tilde case '-' => Separator.Minus @@ -226,7 +226,7 @@ object ParseVersion { case '.' => Separator.Dot } } - def separators[A: P]: P[IndexedSeq[Separator]] = P(CharsWhile(separatorChar).!).map((s: String) => s.toSeq.map(toSeparator)) + def separators[A: P]: P[IndexedSeq[Separator]] = P(CharsWhile(separatorChar).!).map((s: String) => s.toSeq.map(toSeparator)) def listOfSepToPart(list: List[Separator]): List[VersionPart] = { list.map { diff --git a/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala b/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala index f690bcdcb7a..dacb9e0ca86 100644 --- a/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala +++ b/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala @@ -327,7 +327,7 @@ object TestZioSemantic { def apply(s: String): UIO[Unit] } def makeLog: Task[LOG] = ZIO.attempt(new LOG { - val zero = java.lang.System.currentTimeMillis() + val zero = java.lang.System.currentTimeMillis() def apply(s: String) = ZIO.succeed(println(s"[${java.lang.System.currentTimeMillis() - zero}] $s")) }) diff --git a/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala b/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala index 73f3c25f20b..451f97e5c90 100644 --- a/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala +++ b/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala @@ -29,8 +29,8 @@ import org.junit.runners.BlockJUnit4ClassRunner @RunWith(classOf[BlockJUnit4ClassRunner]) class TestControl { - def msg(i: Int): String = s"failed for ${i}" - val l: List[Int] = List(1, 2, 3, 4, 5, 6, 7, 8, 9) + def msg(i: Int): String = s"failed for ${i}" + val l: List[Int] = List(1, 2, 3, 4, 5, 6, 7, 8, 9) @Test def stopSequenceInOrder(): Unit = { From b5ce7c2f3f645b77512b60ec9db7f8f391d163bf Mon Sep 17 00:00:00 2001 From: Matthieu Baechler Date: Thu, 18 Jan 2024 10:29:40 +0100 Subject: [PATCH 4/6] rewrite imports, wildcard and varargs with scala3 syntax --- webapp/sources/.scalafmt.conf | 4 +- .../inventory/domain/AgentTypes.scala | 12 +- .../inventory/domain/DataTypes.scala | 6 +- .../inventory/domain/JsonSerializers.scala | 2 +- .../core/FullInventoryRepository.scala | 4 +- .../inventory/services/core/SoftwareDAO.scala | 2 +- .../provisioning/CheckInventoryDigest.scala | 10 +- .../provisioning/GenericIdFinder.scala | 10 +- .../provisioning/IdFinderAction.scala | 4 +- .../provisioning/InventoryParser.scala | 8 +- .../provisioning/InventorySaver.scala | 6 +- .../services/provisioning/PostCommit.scala | 2 +- .../services/provisioning/PreCommit.scala | 2 +- .../provisioning/PreInventoryParser.scala | 2 +- .../inventory/domain/AgentTypesTest.scala | 6 +- .../inventory/domain/MemoryTest.scala | 6 +- .../fusion/FusionInventoryParser.scala | 20 ++-- .../PreInventoryParserCheckConsistency.scala | 12 +- .../fusion/TestPermNormalizer.scala | 4 +- .../provisioning/fusion/TestPreParsing.scala | 12 +- .../fusion/TestReportParsing.scala | 20 ++-- .../fusion/TestSignatureService.scala | 14 +-- .../ldap/provisioning/PreCommits.scala | 8 +- .../ldap/provisioning/SoftwareIdFinder.scala | 18 +-- .../core/FullInventoryFromLdapEntries.scala | 2 +- .../FullInventoryFromLdapEntriesImpl.scala | 4 +- .../core/FullInventoryRepositoryImpl.scala | 18 +-- .../inventory/ldap/core/InventoryDit.scala | 22 ++-- .../ldap/core/InventoryDitServiceImpl.scala | 2 +- .../inventory/ldap/core/InventoryMapper.scala | 62 +++++----- .../ReadOnlySoftwareInventoryDAOImpl.scala | 20 ++-- .../inventory/ldap/core/SoftwareService.scala | 12 +- .../inventory/ldap/core/TestInventory.scala | 14 +-- .../ldap/core/TestNodeUnserialisation.scala | 10 +- .../cfclerk/domain/AixPasswordHashAlgo.scala | 2 +- .../normation/cfclerk/domain/Compatible.scala | 2 +- .../com/normation/cfclerk/domain/Errors.scala | 2 +- .../normation/cfclerk/domain/Technique.scala | 2 +- .../cfclerk/domain/TechniqueVersion.scala | 2 +- .../cfclerk/domain/VariableAndSection.scala | 6 +- .../domain/VariableAndSectionSpec.scala | 4 +- .../cfclerk/services/TechniqueReader.scala | 4 +- .../services/TechniqueRepository.scala | 4 +- .../services/impl/GitTechniqueReader.scala | 32 +++--- .../impl/TechniqueRepositoryImpl.scala | 12 +- .../xmlparsers/SectionSpecParser.scala | 10 +- .../cfclerk/xmlparsers/TechniqueParser.scala | 10 +- .../xmlparsers/VariableSpecParser.scala | 10 +- .../xmlwriters/SectionSpecWriter.scala | 8 +- .../com/normation/eventlog/EventLog.scala | 2 +- .../rudder/api/ApiAccountRepository.scala | 8 +- .../normation/rudder/api/DataStructures.scala | 6 +- .../rudder/apidata/JsonQueryObjects.scala | 26 ++--- .../rudder/apidata/JsonResponseObjects.scala | 24 ++-- .../rudder/apidata/NodeDetailLevel.scala | 10 +- .../rudder/apidata/RestDataSerializer.scala | 22 ++-- .../rudder/batch/AbstractScheduler.scala | 2 +- .../rudder/batch/AsyncDeploymentActor.scala | 16 +-- .../rudder/batch/AutomaticReportLogger.scala | 10 +- .../batch/AutomaticReportsCleaner.scala | 16 +-- .../normation/rudder/batch/CleanupUsers.scala | 8 +- .../com/normation/rudder/batch/GitGC.scala | 6 +- .../batch/PurgeDeletedInventories.scala | 4 +- .../rudder/batch/PurgeOldInventoryData.scala | 6 +- .../batch/PurgeUnreferencedSoftwares.scala | 6 +- .../rudder/batch/UpdateDynamicGroups.scala | 12 +- .../campaigns/CampaignEventRepository.scala | 18 +-- .../rudder/campaigns/CampaignRepository.scala | 4 +- .../rudder/campaigns/JSONReportsHandler.scala | 4 +- .../campaigns/JsonCampaignSerializer.scala | 8 +- .../campaigns/MainCampaignService.scala | 4 +- .../ConfigurationRepository.scala | 4 +- .../scala/com/normation/rudder/db/DB.scala | 8 +- .../com/normation/rudder/db/Doobie.scala | 38 +++--- .../com/normation/rudder/domain/NodeDit.scala | 16 +-- .../normation/rudder/domain/RudderDit.scala | 48 ++++---- .../rudder/domain/RudderLDAPConstants.scala | 2 +- .../domain/categories/CategoryEntity.scala | 2 +- .../domain/eventlog/ArchiveEventLog.scala | 10 +- .../domain/eventlog/AssetsEventLog.scala | 2 +- .../eventlog/ChangeRequestEventLog.scala | 2 +- .../domain/eventlog/DirectiveEventLog.scala | 2 +- .../domain/eventlog/EventLogCategories.scala | 2 +- .../eventlog/ModifyGlobalProperty.scala | 2 +- .../rudder/domain/eventlog/NodeEventLog.scala | 2 +- .../domain/eventlog/NodeGroupEventLog.scala | 2 +- .../domain/eventlog/ParameterEventLog.scala | 2 +- .../domain/eventlog/PromisesEventLog.scala | 2 +- .../rudder/domain/eventlog/RuleEventLog.scala | 2 +- .../domain/eventlog/TechniqueEventLog.scala | 6 +- .../domain/eventlog/WorkflowEventLog.scala | 2 +- .../domain/logger/DebugComplianceLogger.scala | 2 +- .../logger/DebugNodeConfigurationLogger.scala | 4 +- .../logger/NonCompliantReportLogger.scala | 4 +- .../rudder/domain/nodes/NodeInfo.scala | 14 +-- .../rudder/domain/policies/Directive.scala | 2 +- .../rudder/domain/policies/PolicyMode.scala | 2 +- .../rudder/domain/policies/RuleTarget.scala | 6 +- .../rudder/domain/policies/SimpleDiff.scala | 2 +- .../rudder/domain/policies/Tags.scala | 8 +- .../rudder/domain/properties/Properties.scala | 44 +++---- .../rudder/domain/queries/CmdbQuery.scala | 58 +++++----- .../rudder/domain/queries/DitQueryData.scala | 8 +- .../rudder/domain/queries/GroupCategory.scala | 2 +- .../rudder/domain/queries/JsonSelect.scala | 2 +- .../queries/NodeQueryCriteriaData.scala | 10 +- .../rudder/domain/queries/QueryEntity.scala | 2 +- .../domain/reports/CleanReportsAction.scala | 4 +- .../domain/reports/ComplianceLevel.scala | 12 +- .../domain/reports/ExpectedReports.scala | 14 +-- .../rudder/domain/reports/StatusReports.scala | 14 +-- .../normation/rudder/domain/servers/Srv.scala | 4 +- .../domain/workflows/ChangeRequest.scala | 10 +- .../rudder/facts/nodes/NodeFact.scala | 34 +++--- .../nodes/NodeFactChangeEventCallback.scala | 2 +- .../facts/nodes/NodeFactRepository.scala | 16 +-- .../facts/nodes/NodeFactServiceProxies.scala | 6 +- .../rudder/facts/nodes/NodeFactStorage.scala | 36 +++--- .../normation/rudder/git/GitFindUtils.scala | 10 +- .../rudder/git/GitItemRepository.scala | 12 +- .../rudder/git/GitRepositoryProvider.scala | 10 +- .../rudder/git/GitRevisionProvider.scala | 6 +- .../com/normation/rudder/git/ZipUtils.scala | 6 +- .../com/normation/rudder/hooks/RunHooks.scala | 14 +-- .../normation/rudder/hooks/RunNuCommand.scala | 12 +- .../inventory/InventoryDigestServiceV1.scala | 6 +- .../inventory/InventoryFileWatcher.scala | 18 +-- .../rudder/inventory/InventoryProcessor.scala | 18 +-- .../rudder/inventory/PostCommits.scala | 14 +-- .../metrics/HistorizeNodeCountService.scala | 10 +- .../normation/rudder/metrics/Scheduler.scala | 6 +- .../rudder/migration/XmlEntityMigration.scala | 16 +-- .../XmlFileFormatMigrationEntities.scala | 8 +- .../XmlFileFormatMigration_5_6.scala | 2 +- .../rudder/ncf/DeleteEditorTechnique.scala | 6 +- .../rudder/ncf/EditorTechnique.scala | 2 +- .../rudder/ncf/EditorTechniqueReader.scala | 18 +-- .../rudder/ncf/ResourceFileService.scala | 4 +- .../rudder/ncf/TechniqueCompiler.scala | 26 ++--- .../rudder/ncf/TechniqueSerializer.scala | 4 +- .../rudder/ncf/TechniqueWriter.scala | 8 +- .../MigrateJsonTechniquesService.scala | 14 +-- .../rudder/ncf/yaml/YamlTechnique.scala | 12 +- .../rudder/reports/ComplianceMode.scala | 2 +- .../reports/ReportingConfiguration.scala | 2 +- .../LastProcessedReportRepository.scala | 14 +-- .../ReportsExecutionRepository.scala | 6 +- .../ReportsExecutionRepositoryImpl.scala | 24 ++-- .../execution/ReportsExecutionService.scala | 6 +- .../repository/DirectiveRepository.scala | 10 +- .../repository/EventLogRepository.scala | 2 +- .../ExpectedReportsRepository.scala | 8 +- .../GitModificationRepository.scala | 2 +- .../rudder/repository/ImportLibrary.scala | 2 +- .../repository/ItemArchiveManager.scala | 2 +- .../repository/NodeGroupRepository.scala | 6 +- .../rudder/repository/NodeRepository.scala | 4 +- .../repository/ParameterRepository.scala | 2 +- .../rudder/repository/ReportsRepository.scala | 4 +- .../rudder/repository/RuleRepository.scala | 4 +- .../jdbc/ComplianceRepository.scala | 18 +-- .../jdbc/EventLogJdbcRepository.scala | 24 ++-- .../jdbc/ExpectedReportsJdbcRepository.scala | 32 +++--- .../jdbc/GitModificationRepository.scala | 8 +- .../jdbc/ReportsJdbcRepository.scala | 18 +-- .../jdbc/RudderPropertiesRepository.scala | 12 +- .../repository/json/JsonExctractorUtils.scala | 10 +- .../repository/ldap/LDAPDiffMapper.scala | 26 ++--- .../ldap/LDAPDirectiveRepository.scala | 38 +++--- .../repository/ldap/LDAPEntityMapper.scala | 88 +++++++------- .../ldap/LDAPGitRevisionProvider.scala | 6 +- .../ldap/LDAPNodeGroupRepository.scala | 32 +++--- .../repository/ldap/LDAPNodeRepository.scala | 24 ++-- .../ldap/LDAPParameterRepository.scala | 18 +-- .../repository/ldap/LDAPRuleRepository.scala | 20 ++-- .../ldap/LDAPSwapGroupLibrary.scala | 14 +-- .../ldap/LDAPSwapPolicyLibrary.scala | 8 +- .../rudder/repository/ldap/Lock.scala | 4 +- .../rudder/repository/xml/GitArchivers.scala | 14 +-- .../xml/GitParseRudderObjects.scala | 10 +- .../xml/ItemArchiveManagerImpl.scala | 16 +-- .../rudder/repository/xml/ParseXml.scala | 6 +- .../repository/xml/RudderPrettyPrinter.scala | 6 +- .../repository/xml/XmlArchiverUtils.scala | 8 +- .../category/GitRuleCategoryArchiver.scala | 6 +- .../category/ImportRuleCategoryLibrary.scala | 8 +- .../category/LDAPRuleCategoryRepository.scala | 22 ++-- .../rudder/rule/category/RuleCategory.scala | 2 +- .../category/RuleCategoryRepository.scala | 2 +- .../rudder/score/ComplianceScore.scala | 6 +- .../rudder/score/GlobalScoreRepository.scala | 14 +-- .../com/normation/rudder/score/Score.scala | 6 +- .../rudder/score/ScoreRepository.scala | 8 +- .../normation/rudder/score/ScoreService.scala | 4 +- .../rudder/score/SystemUpdateScore.scala | 6 +- .../rudder/services/ClearCacheService.scala | 4 +- .../ChangeRequestEventLogService.scala | 6 +- .../eventlog/EventLogDetailsService.scala | 26 ++--- .../services/eventlog/EventLogFactory.scala | 16 +-- .../eventlog/EventLogServiceImpl.scala | 18 +-- .../InventoryEventLogServiceImpl.scala | 6 +- .../eventlog/SecretEventLogService.scala | 6 +- .../eventlog/WorkflowEventLogService.scala | 10 +- .../HealthcheckNotificationService.scala | 4 +- .../healthcheck/HealthcheckService.scala | 2 +- .../marshalling/MarshallingUtil.scala | 4 +- .../services/marshalling/TestFileFormat.scala | 2 +- .../marshalling/XmlSerialisationImpl.scala | 10 +- .../marshalling/XmlUnserialisation.scala | 4 +- .../marshalling/XmlUnserialisationImpl.scala | 30 ++--- .../services/modification/DiffService.scala | 4 +- .../modification/ModificationService.scala | 8 +- .../services/nodes/MergeNodeProperties.scala | 16 +-- .../services/nodes/NewNodeManager.scala | 14 +-- .../services/nodes/NodeInfoService.scala | 8 +- .../nodes/PropertyEngineService.scala | 4 +- .../services/nodes/PurgeDeletedNodes.scala | 10 +- .../services/nodes/RemoveNodeService.scala | 32 +++--- .../nodes/history/HistoryLogRepository.scala | 2 +- .../impl/FileHistoryLogRepository.scala | 8 +- .../impl/InventoryHistoryJdbcRepository.scala | 16 +-- .../impl/InventoryHistoryLogRepository.scala | 8 +- .../services/policies/DataStructures.scala | 4 +- .../DependencyAndDeletionService.scala | 18 +-- .../services/policies/DeploymentService.scala | 32 +++--- .../policies/InterpolatedValueCompiler.scala | 16 +-- .../services/policies/JavascriptEngine.scala | 20 ++-- .../policies/MergePolicyService.scala | 10 +- .../services/policies/ParameterService.scala | 6 +- .../RuleApplicationStatusService.scala | 2 +- .../services/policies/RuleValService.scala | 8 +- .../policies/SystemVariableService.scala | 10 +- .../TechniqueAcceptationDatetimeUpdater.scala | 12 +- .../TechniqueReloadingCallbacks.scala | 4 +- .../policies/VariableBuilderService.scala | 2 +- .../policies/WriteNodeCertificatesPem.scala | 6 +- .../NodeConfigurationCacheRepository.scala | 20 ++-- .../policies/write/AgentSpecificLogic.scala | 2 +- .../policies/write/BuildBundleSequence.scala | 18 +-- .../policies/write/PathComputer.scala | 2 +- .../policies/write/PolicyWriterService.scala | 32 +++--- .../write/PrepareTemplateVariables.scala | 12 +- .../services/queries/CmdbQueryParser.scala | 16 +-- .../services/queries/DynGroupService.scala | 30 ++--- .../queries/DynGroupUpdaterService.scala | 4 +- .../services/queries/LdapQueryProcessor.scala | 42 +++---- .../queries/NodeFactQueryProcessor.scala | 10 +- .../quicksearch/QuickSearchBackendImpl.scala | 34 +++--- .../quicksearch/QuickSearchDomain.scala | 6 +- .../quicksearch/QuickSearchQueryParser.scala | 10 +- .../quicksearch/QuickSearchService.scala | 6 +- .../services/reports/ExecutionBatch.scala | 8 +- .../services/reports/NodeChangesService.scala | 16 +-- .../reports/NodeConfigurationService.scala | 10 +- .../reports/ReportingServiceImpl.scala | 22 ++-- .../services/servers/PolicyServerData.scala | 4 +- .../PolicyServerManagementService.scala | 14 +-- .../services/system/DatabaseManager.scala | 2 +- .../services/system/DebugInfoService.scala | 12 +- .../workflows/ChangeRequestService.scala | 2 +- .../CommitAndDeployChangeRequestService.scala | 18 +-- .../services/workflows/WorkflowService.scala | 4 +- .../com/normation/rudder/users/User.scala | 4 +- .../rudder/users/UserRepository.scala | 30 ++--- .../scala/com/normation/JsonSpecMatcher.scala | 4 +- .../scala/com/normation/SomeTestNonUnit.scala | 6 +- .../cfclerk/domain/BundleOrderTest.scala | 4 +- .../cfclerk/domain/HashAlgoTest.scala | 2 +- .../cfclerk/domain/SectionTest.scala | 12 +- .../domain/TechniqueCategoryIdTest.scala | 6 +- .../cfclerk/domain/TechniqueTest.scala | 10 +- .../cfclerk/domain/TechniqueVersionTest.scala | 6 +- .../cfclerk/domain/VariableTest.scala | 16 +-- .../services/DummyTechniqueRepository.scala | 4 +- .../services/JGitPackageReaderTest.scala | 6 +- .../cfclerk/services/JGitRepositoryTest.scala | 6 +- .../services/TechniqueRepositoryTest.scala | 10 +- .../xmlparsers/ParseTechniqueTest.scala | 8 +- .../cfclerk/xmlparsers/TestXmlUtils.scala | 4 +- .../com/normation/rudder/MockServices.scala | 66 +++++------ .../campaign/CampaignSchedulerTest.scala | 4 +- .../com/normation/rudder/db/DBCommon.scala | 14 +-- .../com/normation/rudder/db/DoobieIO.scala | 2 +- .../rudder/db/GenerateCompliance.scala | 16 +-- .../domain/nodes/GenericPropertiesTest.scala | 12 +- .../rudder/domain/nodes/NodeKeyHashTest.scala | 8 +- .../domain/nodes/NodePropertiesTest.scala | 16 +-- .../domain/policies/PolicyModeTest.scala | 6 +- .../domain/policies/RuleTargetTest.scala | 6 +- .../domain/policies/SectionValTest.scala | 8 +- .../rudder/domain/policies/TagsTest.scala | 8 +- .../properties/NodePropertiesTest.scala | 6 +- .../rudder/domain/queries/CmdbQueryTest.scala | 2 +- .../domain/queries/JsonSelectTest.scala | 6 +- .../domain/reports/ExpectedReportTest.scala | 8 +- .../domain/reports/StatusReportTest.scala | 2 +- .../facts/nodes/MockLdapFactStorage.scala | 4 +- .../nodes/TestCoreNodeFactInventory.scala | 24 ++-- .../nodes/TestFullInventoryRepoProxy.scala | 22 ++-- .../facts/nodes/TestSaveInventory.scala | 22 ++-- .../rudder/facts/nodes/TestSelectFacts.scala | 10 +- .../normation/rudder/hooks/HooksTest.scala | 6 +- .../rudder/hooks/RunNuCommandTest.scala | 8 +- .../metrics/NodeCountHistorizationTest.scala | 8 +- .../rudder/metrics/SchedulerTest.scala | 6 +- .../rudder/migration/TestDbMigration.scala | 8 +- .../migration/TestManageMigration.scala | 4 +- .../rudder/migration/TestXmlMigration.scala | 8 +- .../rudder/migration/XMLDataMigration_5.scala | 2 +- .../rudder/migration/XMLDataMigration_6.scala | 2 +- .../rudder/ncf/TestDecodeNcfMethodLib.scala | 2 +- .../ncf/TestEditorTechniqueWriter.scala | 12 +- .../TestEditorTechniqueWriterFallback.scala | 20 ++-- .../jdbc/EventLogJdbcRepositoryTest.scala | 4 +- .../jdbc/GitModificationRepositoryTest.scala | 10 +- .../repository/jdbc/ReportExecutionTest.scala | 6 +- .../jdbc/ReportingServiceTest.scala | 20 ++-- .../repository/jdbc/ReportsProgressTest.scala | 4 +- .../rudder/repository/jdbc/ReportsTest.scala | 10 +- .../ldap/CheckNormationOidTest.scala | 6 +- .../ldap/GlobalParamMigration61Test.scala | 10 +- .../ldap/InventoryNodeInfoCompatTest.scala | 10 +- .../repository/ldap/LoadDemoDataTest.scala | 6 +- .../repository/xml/TestGitFindUtils.scala | 28 ++--- .../eventlog/NodeEventLogFormatV6Test.scala | 2 +- .../marshalling/TestXmlUnserialisation.scala | 4 +- .../nodes/TestMergeGroupProperties.scala | 20 ++-- .../impl/TestFileHistoryLogRepository.scala | 10 +- .../services/policies/NodeConfigData.scala | 12 +- .../policies/NodeExpectedReportTest.scala | 6 +- .../policies/RuleValServiceTest.scala | 10 +- .../policies/TestBuildNodeConfiguration.scala | 12 +- .../services/policies/TestJsEngine.scala | 12 +- .../TestNodeAndGlobalParameterLookup.scala | 36 +++--- .../TestWriteNodeCertificatesPem.scala | 4 +- ...NodeConfigurationCacheRepositoryTest.scala | 10 +- .../policies/write/PathComputerTest.scala | 6 +- .../policies/write/PolicyAgregationTest.scala | 2 +- .../write/PrepareTemplateVariableTest.scala | 8 +- .../policies/write/WriteTechniquesTest.scala | 26 ++--- .../queries/TestJsonQueryLexing.scala | 6 +- .../queries/TestNodeFactQueryProcessor.scala | 18 +-- .../queries/TestPendingNodePolicies.scala | 8 +- .../queries/TestStringQueryParser.scala | 10 +- .../quicksearch/QSRegexQueryParserTest.scala | 12 +- .../CachedFindRuleNodeStatusReportsTest.scala | 6 +- .../services/reports/ComplianceTest.scala | 6 +- .../services/reports/ExecutionBatchTest.scala | 10 +- .../reports/ReportingServiceUtilsTest.scala | 6 +- .../servers/TestRemoveNodeService.scala | 6 +- .../workflows/TestCheckMergeDivergence.scala | 2 +- .../rudder/users/UserRepositoryTest.scala | 4 +- .../utils/RepetitionComputerTest.scala | 4 +- .../appconfig/ConfigRepository.scala | 6 +- .../normation/appconfig/ConfigService.scala | 12 +- .../com/normation/rudder/Authorizations.scala | 18 +-- .../rudder/rest/ApiAuthorization.scala | 16 +-- .../rudder/rest/ApiDatastructures.scala | 8 +- .../rudder/rest/EndpointsDefinition.scala | 4 +- .../rudder/rest/RestExtractorService.scala | 40 +++---- .../com/normation/rudder/rest/RestUtils.scala | 6 +- .../rudder/rest/RoleApiMapping.scala | 6 +- .../rudder/rest/RudderJsonRequest.scala | 2 +- .../rudder/rest/RudderJsonResponse.scala | 10 +- .../rudder/rest/data/Compliance.scala | 12 +- .../rudder/rest/data/CreateNodeData.scala | 24 ++-- .../normation/rudder/rest/data/RestData.scala | 4 +- .../rudder/rest/internal/EventLogAPI.scala | 22 ++-- .../rest/internal/RestApiAccounts.scala | 14 +-- .../rudder/rest/internal/RestCompletion.scala | 8 +- .../rest/internal/RestQuicksearch.scala | 16 +-- .../rest/internal/RulesInternalAPI.scala | 12 +- .../rudder/rest/internal/SharedFilesAPI.scala | 22 ++-- .../rudder/rest/lift/ArchiveApi.scala | 34 +++--- .../rudder/rest/lift/CampaignApi.scala | 8 +- .../rudder/rest/lift/ComplianceApi.scala | 24 ++-- .../rudder/rest/lift/DirectiveApi.scala | 28 ++--- .../rudder/rest/lift/GroupsApi.scala | 44 +++---- .../normation/rudder/rest/lift/HookApi.scala | 8 +- .../normation/rudder/rest/lift/InfoApi.scala | 8 +- .../rudder/rest/lift/InventoryApi.scala | 14 +-- .../rudder/rest/lift/LiftApiDispatcher.scala | 10 +- .../normation/rudder/rest/lift/NodeApi.scala | 57 ++++----- .../rudder/rest/lift/ParametersApi.scala | 22 ++-- .../rudder/rest/lift/PluginApi.scala | 12 +- .../rudder/rest/lift/RecentChangesAPI.scala | 8 +- .../normation/rudder/rest/lift/RuleApi.scala | 36 +++--- .../rudder/rest/lift/SettingsApi.scala | 30 ++--- .../rudder/rest/lift/SystemApi.scala | 14 +-- .../rudder/rest/lift/TechniqueApi.scala | 62 +++++----- .../normation/rudder/rest/v1/RestStatus.scala | 4 +- .../com/normation/rudder/users/User.scala | 2 +- .../rudder/web/model/DirectiveEditor.scala | 18 +-- .../rudder/web/model/FilePermissions.scala | 2 +- .../web/model/JsInitContextLinkUtil.scala | 2 +- .../rudder/web/services/DiffDisplayer.scala | 2 +- .../web/services/DirectiveEditorService.scala | 4 +- .../services/EventLogDetailsGenerator.scala | 26 ++--- .../rudder/web/services/JsTableData.scala | 2 +- .../web/services/Section2FieldService.scala | 8 +- .../rudder/web/services/Translator.scala | 6 +- .../web/services/UserPropertyService.scala | 6 +- .../com/normation/rudder/MockServices.scala | 12 +- .../rudder/rest/ArchiveApiTest.scala | 6 +- .../rudder/rest/CampaignApiTest.scala | 4 +- .../normation/rudder/rest/NodeApiTest.scala | 2 +- .../rudder/rest/RestDataExtractorTest.scala | 12 +- .../normation/rudder/rest/RestTestSetUp.scala | 26 ++--- .../rudder/rest/SharedFilesApiTest.scala | 10 +- .../normation/rudder/rest/SystemApiTest.scala | 8 +- .../rest/TestDirectiveComplianceCsv.scala | 2 +- .../rudder/rest/TestRestFromFileDef.scala | 4 +- .../rudder/rest/TestRestPlusInPath.scala | 6 +- .../rest/TraitTestApiFromYamlFiles.scala | 24 ++-- .../normation/templates/cli/TemplateCli.scala | 12 +- .../templates/cli/JsonVariablesTest.scala | 2 +- .../templates/cli/TemplateCliTest.scala | 2 +- .../templates/FillTemplatesService.scala | 8 +- .../normation/templates/TemplateTest.scala | 6 +- .../bootstrap/liftweb/AppConfigAuth.scala | 23 ++-- .../main/scala/bootstrap/liftweb/Boot.scala | 28 ++--- .../bootstrap/liftweb/BootstrapChecks.scala | 2 +- .../liftweb/LiftInitContextListener.scala | 8 +- .../bootstrap/liftweb/RudderConfig.scala | 108 +++++++++--------- .../liftweb/RudderUserDetailsFile.scala | 12 +- .../action/CheckNcfTechniqueUpdate.scala | 6 +- .../action/CheckTechniqueLibraryReload.scala | 2 +- .../action/LoadNodeComplianceCache.scala | 2 +- .../action/RemoveFaultyLdapEntries.scala | 2 +- .../checks/consistency/CheckConnections.scala | 4 +- .../liftweb/checks/consistency/CheckDIT.scala | 12 +- .../CheckRudderGlobalParameter.scala | 12 +- .../consistency/CloseOpenUserSessions.scala | 4 +- ...CheckAddSpecialNodeGroupsDescription.scala | 8 +- .../CheckMigrationXmlFileFormat.scala | 4 +- .../migration/CheckRemoveRuddercSetting.scala | 4 +- .../checks/migration/CheckTableScore.scala | 10 +- .../checks/migration/CheckTableUsers.scala | 10 +- .../checks/migration/DbCommonMigration.scala | 2 +- ...MigrateChangeValidationEnforceSchema.scala | 8 +- .../MigrateEventLogEnforceSchema.scala | 10 +- .../MigrateJsonTechniquesToYaml.scala | 8 +- .../MigrateNodeAcceptationInventories.scala | 10 +- .../CheckInitUserTemplateLibrary.scala | 12 +- .../onetimeinit/CheckInitXmlExport.scala | 6 +- .../normation/plugins/ExtendableSnippet.scala | 2 +- .../com/normation/plugins/PublicPlugin.scala | 2 +- .../com/normation/plugins/RudderPlugin.scala | 10 +- .../normation/plugins/RudderPluginJson.scala | 8 +- .../plugins/SnippetExtensionRegister.scala | 10 +- .../normation/rudder/web/ChooseTemplate.scala | 6 +- .../rudder/web/comet/AsyncDeployment.scala | 14 +-- .../components/AgentPolicyModeEditForm.scala | 6 +- .../components/AgentScheduleEditForm.scala | 10 +- .../components/AutoCompleteAutoSubmit.scala | 24 ++-- .../components/ComplianceModeEditForm.scala | 12 +- .../DirectiveApplicationManagement.scala | 4 +- .../web/components/DirectiveEditForm.scala | 28 ++--- .../components/NodeGroupCategoryForm.scala | 16 +-- .../rudder/web/components/NodeGroupForm.scala | 36 +++--- .../rudder/web/components/NodeStateForm.scala | 6 +- .../PendingChangeRequestDisplayer.scala | 4 +- .../web/components/RuleCategoryTree.scala | 18 +-- .../rudder/web/components/RuleDisplayer.scala | 14 +-- .../rudder/web/components/RuleGrid.scala | 30 ++--- .../web/components/SearchNodeComponent.scala | 24 ++-- .../components/ShowNodeDetailsFromNode.scala | 12 +- .../rudder/web/components/TagsEditForm.scala | 8 +- .../TechniqueCategoryEditForm.scala | 18 +-- .../web/components/TechniqueEditForm.scala | 32 +++--- .../rudder/web/components/TechniqueTree.scala | 14 +-- .../CreateActiveTechniqueCategoryPopup.scala | 14 +-- .../popup/CreateCategoryOrGroupPopup.scala | 20 ++-- .../popup/CreateCloneDirectivePopup.scala | 20 ++-- .../popup/CreateCloneGroupPopup.scala | 20 ++-- .../CreateOrUpdateGlobalParameterPopup.scala | 22 ++-- .../components/popup/CreateRulePopup.scala | 18 +-- .../popup/ExpectedPolicyPopup.scala | 8 +- .../components/popup/GiveReasonPopup.scala | 16 +-- .../popup/ModificationValidationPopup.scala | 24 ++-- .../components/popup/RuleCategoryPopup.scala | 14 +-- .../RuleModificationValidationPopup.scala | 24 ++-- .../web/model/DirectiveFieldEditors.scala | 26 ++--- .../rudder/web/model/JsTreeNode.scala | 4 +- .../rudder/web/model/RudderBaseField.scala | 18 +-- .../rudder/web/model/SessionVars.scala | 2 +- .../web/services/AsyncComplianceService.scala | 12 +- .../rudder/web/services/ComplianceData.scala | 14 +-- .../web/services/DisplayDirectiveTree.scala | 10 +- .../rudder/web/services/DisplayNode.scala | 26 ++--- .../web/services/DisplayNodeGroupTree.scala | 2 +- .../web/services/EventListDisplayer.scala | 24 ++-- .../web/services/JsTreeUtilService.scala | 8 +- .../rudder/web/services/LogDisplayer.scala | 16 +-- .../rudder/web/services/NodeGrid.scala | 22 ++-- .../rudder/web/services/ReportDisplayer.scala | 14 +-- .../rudder/web/services/SrvGrid.scala | 24 ++-- .../TechniqueReloadingCallbacks.scala | 4 +- .../web/services/UserSessionLogEvent.scala | 4 +- .../normation/rudder/web/snippet/Authz.scala | 4 +- .../rudder/web/snippet/BaseUrl.scala | 6 +- .../rudder/web/snippet/CommonLayout.scala | 8 +- .../rudder/web/snippet/HealthcheckInfo.scala | 2 +- .../rudder/web/snippet/HomePage.scala | 28 ++--- .../normation/rudder/web/snippet/Index.scala | 4 +- .../web/snippet/PluginExpirationInfo.scala | 4 +- .../rudder/web/snippet/RegisterToasts.scala | 6 +- .../rudder/web/snippet/SetupRedirect.scala | 6 +- .../rudder/web/snippet/UserInformation.scala | 10 +- .../normation/rudder/web/snippet/Util.scala | 4 +- .../web/snippet/administration/Archives.scala | 18 +-- .../snippet/administration/ClearCache.scala | 12 +- .../administration/DatabaseManagement.scala | 14 +-- .../administration/DyngroupReloading.scala | 10 +- .../EditPolicyServerAllowedNetwork.scala | 18 +-- .../administration/EventLogsViewer.scala | 6 +- .../administration/PluginManagement.scala | 4 +- .../administration/PropertiesManagement.scala | 32 +++--- .../administration/SupportScript.scala | 2 +- .../TechniqueLibraryManagement.scala | 26 ++--- .../configuration/DirectiveManagement.scala | 24 ++-- .../configuration/ParameterManagement.scala | 16 +-- .../rudder/web/snippet/node/AcceptNode.scala | 18 +-- .../rudder/web/snippet/node/Groups.scala | 28 ++--- .../rudder/web/snippet/node/Node.scala | 4 +- .../web/snippet/node/NodeHistoryViewer.scala | 14 +-- .../rudder/web/snippet/node/Nodes.scala | 4 +- .../web/snippet/node/PendingHistoryGrid.scala | 24 ++-- .../rudder/web/snippet/node/SearchNodes.scala | 6 +- .../net/liftweb/http/ClasspathTemplates.scala | 6 +- .../scala/net/liftweb/http/LocalSnippet.scala | 2 +- .../liftweb/RudderUserDetailsTest.scala | 6 +- .../RudderUserPasswordEncoderTest.scala | 2 +- ...MigrateChangeValidationEnforceSchema.scala | 8 +- .../TestMigrateEventLogEnforceSchema.scala | 8 +- .../TestMigrateJsonTechniquesToYaml.scala | 12 +- ...estMigrateNodeAcceptationInventories.scala | 20 ++-- .../plugins/RudderPluginJsonTest.scala | 4 +- .../normation/plugins/RudderPluginTest.scala | 2 +- .../javascript/CalculateComplianceTest.scala | 4 +- .../services/Section2FieldServiceTest.scala | 2 +- .../rudder/web/snippet/HomePageTest.scala | 2 +- .../normation/ldap/ldif/LDIFFileLogger.scala | 2 +- .../InMemoryDsConnectionProvider.scala | 12 +- .../com/normation/ldap/sdk/BuildFilter.scala | 6 +- .../normation/ldap/sdk/LDAPConnection.scala | 32 +++--- .../ldap/sdk/LDAPConnectionProvider.scala | 10 +- .../com/normation/ldap/sdk/LDAPEntry.scala | 22 ++-- .../com/normation/ldap/sdk/LDAPIOResult.scala | 6 +- .../com/normation/ldap/sdk/LDAPTree.scala | 8 +- .../ldap/sdk/schema/LDAPSchema.scala | 4 +- .../scala/com/normation/ldap/sdk/syntax.scala | 8 +- .../com/normation/ldap/sdk/LDAPTreeTest.scala | 4 +- .../normation/ldap/sdk/LoadDemoDataTest.scala | 12 +- .../ldap/sdk/schema/SchemaTest.scala | 2 +- .../main/scala/com/normation/ZioCommons.scala | 36 +++--- .../scala/com/normation/utils/Control.scala | 4 +- .../com/normation/utils/CronParser.scala | 2 +- .../normation/utils/DateFormaterService.scala | 2 +- .../scala/com/normation/utils/Version.scala | 6 +- .../scala/com/normation/ZioCommonsTest.scala | 28 ++--- .../com/normation/utils/TestControl.scala | 4 +- .../utils/TestStandardFieldValidation.scala | 6 +- .../scala/com/normation/utils/TestUtils.scala | 4 +- .../com/normation/utils/VersionTest.scala | 12 +- .../src/test/scala/zio/yaml/ZioYamlTest.scala | 6 +- 566 files changed, 3227 insertions(+), 3223 deletions(-) diff --git a/webapp/sources/.scalafmt.conf b/webapp/sources/.scalafmt.conf index 26fdc2be3da..90863b9d784 100644 --- a/webapp/sources/.scalafmt.conf +++ b/webapp/sources/.scalafmt.conf @@ -1,7 +1,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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala index f0e2c81205f..da2166c0972 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala +++ b/webapp/sources/ldap-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 @@ -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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala index f82deb085dd..42f24ccbbce 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala +++ b/webapp/sources/ldap-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/JsonSerializers.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/JsonSerializers.scala index dab868b034e..a21f3e33549 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/JsonSerializers.scala +++ b/webapp/sources/ldap-inventory/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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/core/FullInventoryRepository.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/core/FullInventoryRepository.scala index 5fba87c8d5d..36982ae10f4 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/core/FullInventoryRepository.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/core/SoftwareDAO.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/core/SoftwareDAO.scala index 3f2831b0ec2..aa00cd8f19f 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/core/SoftwareDAO.scala +++ b/webapp/sources/ldap-inventory/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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala index 6cd9421f68b..54d6768804f 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala +++ b/webapp/sources/ldap-inventory/inventory-api/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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala index ec9a1f61620..5f5f592f734 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/IdFinderAction.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/IdFinderAction.scala index f304ac3ad01..e6f7dd4b528 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/IdFinderAction.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventoryParser.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventoryParser.scala index bc460510852..b49b40946cb 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventoryParser.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala index b92923feb36..a86eebfff76 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PostCommit.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PostCommit.scala index 93ae6ba152a..4c90431cf08 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PostCommit.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreCommit.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreCommit.scala index 2c811403bee..46121c86c12 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreCommit.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreInventoryParser.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreInventoryParser.scala index d6e4c93e78a..4527356b6b8 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/PreInventoryParser.scala +++ b/webapp/sources/ldap-inventory/inventory-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/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala b/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala index a98d9d6bee2..23992645de9 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala +++ b/webapp/sources/ldap-inventory/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/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/MemoryTest.scala b/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/MemoryTest.scala index 64fc83bff28..bcc0b7a3719 100644 --- a/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/MemoryTest.scala +++ b/webapp/sources/ldap-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/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala index be7f8d2270d..8b9b79a0ccc 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/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/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala index 363bd7b78f8..7b85c045796 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/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 } } diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPermNormalizer.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPermNormalizer.scala index 939c8be0cb7..245f134a28c 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPermNormalizer.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPermNormalizer.scala @@ -38,8 +38,8 @@ package com.normation.inventory.provisioning package fusion -import org.junit._ -import org.junit.Assert._ +import org.junit.* +import org.junit.Assert.* import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala index 84d18f0a8d4..3dd34a1581d 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsing.scala @@ -36,16 +36,16 @@ package com.normation.inventory.provisioning.fusion -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.services.provisioning.PreInventoryParser -import com.normation.zio._ +import com.normation.zio.* import java.io.InputStream -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import scala.xml.NodeSeq import scala.xml.XML -import zio._ +import zio.* /** * A simple test class to check that the demo data file is up to date diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala index ddadf05e320..e97ed5fb22b 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala @@ -37,19 +37,19 @@ package com.normation.inventory.provisioning.fusion -import com.normation.errors._ -import com.normation.inventory.domain._ -import com.normation.inventory.domain.AgentType._ +import com.normation.errors.* +import com.normation.inventory.domain.* +import com.normation.inventory.domain.AgentType.* import com.normation.utils.StringUuidGeneratorImpl import com.normation.zio.ZioRuntime import java.io.File -import net.liftweb.common._ -import net.liftweb.json.JsonAST._ -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import net.liftweb.common.* +import net.liftweb.json.JsonAST.* +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import scala.annotation.nowarn -import zio._ +import zio.* /** * A simple test class to check that the demo data file is up to date @@ -514,7 +514,7 @@ class TestInventoryParsing extends Specification with Loggable { } "Virtuozzo VM should be correctly parsed" in { val inventory = parseRun("fusion-inventories/virtuozzo.ocs") - import com.normation.inventory.domain.VmType._ + import com.normation.inventory.domain.VmType.* (inventory.machine.machineType must beEqualTo(VirtualMachineType(Virtuozzo))) and (inventory.node.main.osDetails must beEqualTo( Linux(Debian, "Debian GNU/Linux 9.5 (stretch)", new Version("9.5"), None, new Version("4.9.0-7-amd64")) diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestSignatureService.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestSignatureService.scala index cd5de4ab1d2..0994d0cdbd3 100644 --- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestSignatureService.scala +++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestSignatureService.scala @@ -36,22 +36,22 @@ package com.normation.inventory.provisioning.fusion -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.Inventory import com.normation.inventory.domain.InventoryError import com.normation.inventory.domain.KeyStatus import com.normation.inventory.domain.SecurityToken -import com.normation.inventory.services.provisioning._ +import com.normation.inventory.services.provisioning.* import com.normation.utils.StringUuidGeneratorImpl import com.normation.zio.ZioRuntime import java.io.InputStream import java.security.Security -import net.liftweb.common._ +import net.liftweb.common.* import org.bouncycastle.jce.provider.BouncyCastleProvider -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ -import zio._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* +import zio.* @RunWith(classOf[JUnitRunner]) class TestSignatureService extends Specification with Loggable { diff --git a/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/PreCommits.scala b/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/PreCommits.scala index 9b3954b7fb6..8db8e1a03a0 100644 --- a/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/PreCommits.scala +++ b/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/PreCommits.scala @@ -37,11 +37,11 @@ package com.normation.inventory.ldap.provisioning -import com.normation.errors._ -import com.normation.inventory.domain._ +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.inventory.domain.Inventory -import com.normation.inventory.services.provisioning._ -import zio.syntax._ +import com.normation.inventory.services.provisioning.* +import zio.syntax.* /** * Check OS Type. diff --git a/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/SoftwareIdFinder.scala b/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/SoftwareIdFinder.scala index bdc229be54d..c49326ed3be 100644 --- a/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/SoftwareIdFinder.scala +++ b/webapp/sources/ldap-inventory/inventory-provisioning-core/src/main/scala/com/normation/inventory/ldap/provisioning/SoftwareIdFinder.scala @@ -37,16 +37,16 @@ package com.normation.inventory.ldap.provisioning -import com.normation.errors._ -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.inventory.services.provisioning._ -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.errors.* +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.inventory.services.provisioning.* +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* import org.slf4j.Logger import org.slf4j.LoggerFactory -import zio._ +import zio.* object NameAndVersionIdFinder { val logger: Logger = LoggerFactory.getLogger(classOf[NameAndVersionIdFinder]) @@ -78,7 +78,7 @@ class NameAndVersionIdFinder( } AND(nameFilter, versionFilter) - }.toSeq: _*) + }.toSeq*) // get potential entries, and only get the one with a A_SOFTWARE_UUID // return the list of A_SOFTWARE_UUID sorted diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntries.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntries.scala index bc89c882289..e491762bf7d 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntries.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntries.scala @@ -37,7 +37,7 @@ package com.normation.inventory.ldap.core -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.FullInventory import com.normation.ldap.sdk.LDAPEntry diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntriesImpl.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntriesImpl.scala index 3c39306ed07..a1044bf5d4c 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntriesImpl.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryFromLdapEntriesImpl.scala @@ -37,12 +37,12 @@ package com.normation.inventory.ldap.core -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.FullInventory import com.normation.ldap.sdk.LDAPEntry import com.normation.ldap.sdk.LDAPTree import scala.collection.mutable.Buffer -import zio.syntax._ +import zio.syntax.* class FullInventoryFromLdapEntriesImpl( inventoryDitService: InventoryDitService, diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryRepositoryImpl.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryRepositoryImpl.scala index ef15b6fb1b1..1c2c7d4d896 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryRepositoryImpl.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/FullInventoryRepositoryImpl.scala @@ -38,14 +38,14 @@ package com.normation.inventory.ldap.core import cats.data.NonEmptyList -import com.normation.errors._ -import com.normation.inventory.domain._ +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.inventory.ldap.core.LDAPConstants.A_CONTAINER_DN import com.normation.inventory.ldap.core.LDAPConstants.A_NODE_UUID -import com.normation.inventory.services.core._ -import com.normation.ldap.sdk._ +import com.normation.inventory.services.core.* +import com.normation.ldap.sdk.* import com.normation.ldap.sdk.BuildFilter.EQ -import com.normation.ldap.sdk.LDAPIOResult._ +import com.normation.ldap.sdk.LDAPIOResult.* import com.normation.utils.HostnameRegex import com.normation.utils.NodeIdRegex import com.unboundid.ldap.sdk.DN @@ -53,8 +53,8 @@ import com.unboundid.ldap.sdk.Filter import com.unboundid.ldap.sdk.Modification import com.unboundid.ldap.sdk.ModificationType import com.unboundid.ldif.LDIFChangeRecord -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* trait LDAPFullInventoryRepository extends FullInventoryRepository[Seq[LDIFChangeRecord]] @@ -161,7 +161,7 @@ class FullInventoryRepositoryImpl( def getNodesForMachine(con: RwLDAPConnection, id: MachineUuid): LDAPIOResult[Map[InventoryStatus, Set[LDAPEntry]]] = { val status = Seq(PendingInventory, AcceptedInventory, RemovedInventory) - val orFilter = BuildFilter.OR(status.map(x => EQ(A_CONTAINER_DN, dnMachine(id, x).toString)): _*) + val orFilter = BuildFilter.OR(status.map(x => EQ(A_CONTAINER_DN, dnMachine(id, x).toString))*) def machineForNodeStatus(con: RwLDAPConnection, inventoryStatus: InventoryStatus) = { con.searchOne(nodeDn(inventoryStatus), orFilter, A_NODE_UUID).map(_.toSet) @@ -316,7 +316,7 @@ class FullInventoryRepositoryImpl( .map(dnToString) .sorted .map(a => Filter.create(s"entryDN:dnSubtreeMatch:=${a}")) - BuildFilter.OR(dnFilters: _*) + BuildFilter.OR(dnFilters*) } for { diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDit.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDit.scala index 4c9b68d3c5d..9787c50dc82 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDit.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDit.scala @@ -37,10 +37,10 @@ package com.normation.inventory.ldap.core -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.ldap.core.InventoryMappingResult.InventoryMappingPure import com.normation.inventory.ldap.core.InventoryMappingRudderError.MalformedDN -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.ldap.sdk.LDAPEntry import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.RDN @@ -158,37 +158,37 @@ final case class InventoryDit(val BASE_DN: DN, val SOFTWARE_BASE_DN: DN, val nam def genericModel(id: NodeId): LDAPEntry = { val mod = model(id) - mod.addValues(A_OC, OC.objectClassNames(OC_NODE).toSeq: _*) + mod.addValues(A_OC, OC.objectClassNames(OC_NODE).toSeq*) mod } def linuxModel(id: NodeId): LDAPEntry = { val mod = model(id) - mod.addValues(A_OC, OC.objectClassNames(OC_LINUX_NODE).toSeq: _*) + mod.addValues(A_OC, OC.objectClassNames(OC_LINUX_NODE).toSeq*) mod } def windowsModel(id: NodeId): LDAPEntry = { val mod = model(id) - mod.addValues(A_OC, OC.objectClassNames(OC_WINDOWS_NODE).toSeq: _*) + mod.addValues(A_OC, OC.objectClassNames(OC_WINDOWS_NODE).toSeq*) mod } def solarisModel(id: NodeId): LDAPEntry = { val mod = model(id) - mod.addValues(A_OC, OC.objectClassNames(OC_SOLARIS_NODE).toSeq: _*) + mod.addValues(A_OC, OC.objectClassNames(OC_SOLARIS_NODE).toSeq*) mod } def aixModel(id: NodeId): LDAPEntry = { val mod = model(id) - mod.addValues(A_OC, OC.objectClassNames(OC_AIX_NODE).toSeq: _*) + mod.addValues(A_OC, OC.objectClassNames(OC_AIX_NODE).toSeq*) mod } def bsdModel(id: NodeId): LDAPEntry = { val mod = model(id) - mod.addValues(A_OC, OC.objectClassNames(OC_BSD_NODE).toSeq: _*) + mod.addValues(A_OC, OC.objectClassNames(OC_BSD_NODE).toSeq*) mod } @@ -289,7 +289,7 @@ class UUID_ENTRY[U <: Uuid](val entryObjectClass: String, val rdnAttributeName: def model(uuid: U): LDAPEntry = { val mod = LDAPEntry(dn(uuid)) - mod.resetValuesTo(A_OC, OC.objectClassNames(entryObjectClass).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(entryObjectClass).toSeq*) mod } } @@ -304,7 +304,7 @@ class OU(ouName: String, parentDn: DN) extends ENTRY1("ou", ouName) { lazy val dn = new DN(rdn, parentDn) def model: LDAPEntry = { val mod = LDAPEntry(dn) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_OU).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_OU).toSeq*) mod } } @@ -320,7 +320,7 @@ class ELT[U <: Uuid](eltObjectClass: String, override val rdnAttribute: Tuple1[S def dn(uuid: U, y: String) = new DN(rdn(y), parentEntry.dn(uuid)) def model(uuid: U, y: String): LDAPEntry = { val mod = LDAPEntry(new DN(rdn(y), parentEntry.dn(uuid))) - mod.resetValuesTo(A_OC, OC.objectClassNames(eltObjectClass).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(eltObjectClass).toSeq*) mod } } diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDitServiceImpl.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDitServiceImpl.scala index 774687bcdf9..ab14f560c59 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDitServiceImpl.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryDitServiceImpl.scala @@ -37,7 +37,7 @@ package com.normation.inventory.ldap.core -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.unboundid.ldap.sdk.DN /** diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala index 2b5d518e94b..33eaaba9e05 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala @@ -37,24 +37,24 @@ package com.normation.inventory.ldap.core -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.RudderError -import com.normation.inventory.domain._ -import com.normation.inventory.domain.InetAddressUtils._ +import com.normation.inventory.domain.* +import com.normation.inventory.domain.InetAddressUtils.* import com.normation.inventory.domain.NodeTimezone -import com.normation.inventory.domain.VmType._ -import com.normation.inventory.ldap.core.InventoryMappingResult._ -import com.normation.inventory.ldap.core.InventoryMappingRudderError._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ +import com.normation.inventory.domain.VmType.* +import com.normation.inventory.ldap.core.InventoryMappingResult.* +import com.normation.inventory.ldap.core.InventoryMappingRudderError.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* import com.normation.ldap.sdk.schema.LDAPObjectClass -import com.softwaremill.quicklens._ -import com.unboundid.ldap.sdk.{Version => _, _} +import com.softwaremill.quicklens.* +import com.unboundid.ldap.sdk.{Version as _, *} import java.net.InetAddress -import net.liftweb.json._ +import net.liftweb.json.* import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* sealed trait InventoryMappingRudderError extends RudderError object InventoryMappingRudderError { @@ -92,7 +92,7 @@ object InventoryMappingResult { ////////////////// Node Custom Properties ///////////////////////// object CustomPropertiesSerialization { - import net.liftweb.json._ + import net.liftweb.json.* /* * CustomProperty serialization must follow NodeProperties one: @@ -498,7 +498,7 @@ class InventoryMapper( } } val machineTypes = objectClassNames.filter(x => machineTypesNames.exists(y => x.equalsIgnoreCase(y))) - val types = OC.demux(machineTypes.toSeq: _*) - OC(OC_MACHINE) + val types = OC.demux(machineTypes.toSeq*) - OC(OC_MACHINE) if (types.size == 1) objectClass2MachineType(types.head) else UnknownMachineType } @@ -507,7 +507,7 @@ class InventoryMapper( val dit = ditService.getDit(machine.status) val root = dit.MACHINES.MACHINE.model(machine.id) root.setOpt(machine.mbUuid, A_MB_UUID, (x: MotherBoardUuid) => x.value) - root.addValues(A_OC, OC.objectClassNames(machineType2ObjectClass(machine.machineType).name): _*) + root.addValues(A_OC, OC.objectClassNames(machineType2ObjectClass(machine.machineType).name)*) root.setOpt(machine.inventoryDate, A_INVENTORY_DATE, (x: DateTime) => GeneralizedTime(x).toString) root.setOpt(machine.receiveDate, A_RECEIVE_DATE, (x: DateTime) => GeneralizedTime(x).toString) root.setOpt(machine.name.orElse(Some(machine.id.value)), A_NAME, (x: String) => x) @@ -562,7 +562,7 @@ class InventoryMapper( path: MachineInventory => PathModify[MachineInventory, Seq[T]] ): UIO[MachineInventory] = mapAndAddElementGeneric[MachineInventory, T](machine, entry, name, f, path) - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* entry match { case e if (e.isA(OC_MEMORY)) => mapAndAdd("memory slot", memorySlotFromEntry, _.modify(_.memories)) @@ -649,7 +649,7 @@ class InventoryMapper( if (list.isEmpty) { e deleteAttribute attr } else { - e.resetValuesTo(attr, list.map(_.getHostAddress): _*) + e.resetValuesTo(attr, list.map(_.getHostAddress)*) } } @@ -722,7 +722,7 @@ class InventoryMapper( ////////////////// Node Custom Properties ///////////////////////// object CustomPropertiesSerialization { - import net.liftweb.json._ + import net.liftweb.json.* /* * CustomProperty serialization must follow NodeProperties one: @@ -834,7 +834,7 @@ class InventoryMapper( // This won't include the Process in it, it needs to be done with method // processesFromNode below def treeFromNode(server: NodeInventory): LDAPTree = { - import com.normation.inventory.domain.AgentInfoSerialisation._ + import com.normation.inventory.domain.AgentInfoSerialisation.* val dit = ditService.getDit(server.main.status) // the root entry of the tree: the machine inventory @@ -855,19 +855,19 @@ class InventoryMapper( root.setOpt(server.lastLoggedUserTime, A_LAST_LOGGED_USER_TIME, (x: DateTime) => GeneralizedTime(x).toString) root.setOpt(server.inventoryDate, A_INVENTORY_DATE, (x: DateTime) => GeneralizedTime(x).toString) root.setOpt(server.receiveDate, A_RECEIVE_DATE, (x: DateTime) => GeneralizedTime(x).toString) - root.resetValuesTo(A_AGENTS_NAME, server.agents.map(x => x.toJsonString): _*) - root.resetValuesTo(A_SOFTWARE_DN, server.softwareIds.map(x => dit.SOFTWARE.SOFT.dn(x).toString): _*) - root.resetValuesTo(A_EV, server.environmentVariables.map(x => Serialization.write(x)): _*) - root.resetValuesTo(A_LIST_OF_IP, server.serverIps.distinct: _*) + root.resetValuesTo(A_AGENTS_NAME, server.agents.map(x => x.toJsonString)*) + root.resetValuesTo(A_SOFTWARE_DN, server.softwareIds.map(x => dit.SOFTWARE.SOFT.dn(x).toString)*) + root.resetValuesTo(A_EV, server.environmentVariables.map(x => Serialization.write(x))*) + root.resetValuesTo(A_LIST_OF_IP, server.serverIps.distinct*) // we don't know their dit... root.resetValuesTo( A_CONTAINER_DN, server.machineId.map { case (id, status) => ditService.getDit(status).MACHINES.MACHINE.dn(id).toString - }.toSeq: _* + }.toSeq* ) - root.resetValuesTo(A_ACCOUNT, server.accounts: _*) + root.resetValuesTo(A_ACCOUNT, server.accounts*) server.timezone.foreach { timezone => root.resetValuesTo(A_TIMEZONE_NAME, timezone.name) root.resetValuesTo(A_TIMEZONE_OFFSET, timezone.offset) @@ -877,8 +877,8 @@ class InventoryMapper( root.addValues(A_CUSTOM_PROPERTY, cp.toJson) } server.softwareUpdates.foreach { s => - import zio.json._ - import JsonSerializers.implicits._ + import zio.json.* + import JsonSerializers.implicits.* root.addValues(A_SOFTWARE_UPDATE, s.toJson) } @@ -897,7 +897,7 @@ class InventoryMapper( val entry = createNodeModelFromServer(node) // convert the processes - entry.resetValuesTo(A_PROCESS, node.processes.map(x => Serialization.write(x)): _*) + entry.resetValuesTo(A_PROCESS, node.processes.map(x => Serialization.write(x))*) entry } @@ -1110,8 +1110,8 @@ class InventoryMapper( }) } softwareUpdates <- ZIO.foreach(entry.valuesFor(A_SOFTWARE_UPDATE)) { a => - import JsonSerializers.implicits._ - import zio.json._ + import JsonSerializers.implicits.* + import zio.json.* a.fromJson[SoftwareUpdate] match { case Left(err) => InventoryProcessingLogger.warn( diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/ReadOnlySoftwareInventoryDAOImpl.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/ReadOnlySoftwareInventoryDAOImpl.scala index 11bfb87d424..3920d30f0a2 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/ReadOnlySoftwareInventoryDAOImpl.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/ReadOnlySoftwareInventoryDAOImpl.scala @@ -38,19 +38,19 @@ package com.normation.inventory.ldap.core import com.normation.NamedZioLogger -import com.normation.errors._ -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.errors.* +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.inventory.services.core.ReadOnlySoftwareDAO import com.normation.inventory.services.core.WriteOnlySoftwareDAO -import com.normation.ldap.sdk._ +import com.normation.ldap.sdk.* import com.normation.ldap.sdk.BuildFilter.EQ import com.normation.ldap.sdk.BuildFilter.IS import com.normation.ldap.sdk.BuildFilter.OR -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN -import zio.{System => _, _} -import zio.syntax._ +import zio.{System as _, *} +import zio.syntax.* object TimingDebugLoggerPure extends NamedZioLogger { override def loggerName: String = "debug_timing" @@ -121,11 +121,11 @@ class ReadOnlySoftwareDAOImpl( override def getSoftwareByNode(nodeIds: Set[NodeId], status: InventoryStatus): IOResult[Map[NodeId, Seq[Software]]] = { val dit = inventoryDitService.getDit(status) - val orFilter = BuildFilter.OR(nodeIds.toSeq.map(x => EQ(A_NODE_UUID, x.value)): _*) + val orFilter = BuildFilter.OR(nodeIds.toSeq.map(x => EQ(A_NODE_UUID, x.value))*) (for { con <- ldap n3 <- currentTimeMillis - nodeEntries <- con.searchOne(dit.NODES.dn, orFilter, Seq(A_NODE_UUID, A_SOFTWARE_DN): _*) + nodeEntries <- con.searchOne(dit.NODES.dn, orFilter, Seq(A_NODE_UUID, A_SOFTWARE_DN)*) n4 <- currentTimeMillis _ <- TimingDebugLoggerPure.debug(s"Fetching ${nodeEntries.size} nodes entries in ${n4 - n3} ms") @@ -204,7 +204,7 @@ class ReadOnlySoftwareDAOImpl( } t2 <- currentTimeMillis ids <- { - val orFilter = BuildFilter.OR(nodeIds.map(x => EQ(A_NODE_UUID, x.value)): _*) + val orFilter = BuildFilter.OR(nodeIds.map(x => EQ(A_NODE_UUID, x.value))*) for { softwareEntry <- con.searchSub(nodeBaseSearch, orFilter, A_SOFTWARE_DN) } yield { diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/SoftwareService.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/SoftwareService.scala index e366e2cd9b1..2f938ea7d20 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/SoftwareService.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/SoftwareService.scala @@ -1,14 +1,14 @@ package com.normation.inventory.ldap.core -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.InventoryProcessingLogger import com.normation.inventory.services.core.ReadOnlySoftwareDAO import com.normation.inventory.services.core.WriteOnlySoftwareDAO import com.normation.utils.DateFormaterService -import com.normation.zio._ +import com.normation.zio.* import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* trait SoftwareService { def deleteUnreferencedSoftware(): UIO[Int] @@ -54,8 +54,8 @@ class SoftwareServiceImpl( s"[purge unreferenced software] Found ${extraSoftware.size} unreferenced software in ou=software, going to delete them" ) _ <- InventoryProcessingLogger.ifDebugEnabled { - import better.files._ - import better.files.Dsl._ + import better.files.* + import better.files.Dsl.* (for { f <- IOResult.attempt { val dir = File("/var/rudder/tmp/purgeSoftware") diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala index 84a5ed01da8..58cfc614632 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala @@ -37,22 +37,22 @@ package com.normation.inventory.ldap.core -import com.normation.errors._ -import com.normation.inventory.domain._ +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.ldap.listener.InMemoryDsConnectionProvider import com.normation.ldap.sdk.RoLDAPConnection import com.normation.ldap.sdk.RwLDAPConnection import com.normation.zio.ZioRuntime -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.Modification import com.unboundid.ldap.sdk.ModificationType -import org.junit.runner._ +import org.junit.runner.* import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* import scala.annotation.nowarn -import zio._ +import zio.* final case class SystemError(cause: Throwable) extends RudderError { def msg = "Error in test" diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala index f5cf88fab60..5b2c16ddd66 100644 --- a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala +++ b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala @@ -37,14 +37,14 @@ package com.normation.inventory.ldap.core -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.ldap.sdk.LDAPEntry import com.normation.zio.ZioRuntime import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.Entry -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 node unserialisation frome entries, in particular @@ -244,7 +244,7 @@ class TestNodeUnserialisation extends Specification { } def node(ldif: String): NodeInventory = { - val nodeEntry = new LDAPEntry(new Entry(ldif.split("\n").toSeq: _*)) + val nodeEntry = new LDAPEntry(new Entry(ldif.split("\n").toSeq*)) ZioRuntime.unsafeRun(mapper.nodeFromEntry(nodeEntry).either).getOrElse(throw new Exception("Error when getting node")) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala index 6fbbb35842e..b11c7bc5d69 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala @@ -74,7 +74,7 @@ import scala.util.Random * Hope this decription may help other people find there way to generate AIX hash string. */ object AixPasswordHashAlgo extends Loggable { - import java.lang.{StringBuilder => JStringBuilder} + import java.lang.StringBuilder as JStringBuilder /** * Table with characters for Sha-Crypt Base64 transformation, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Compatible.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Compatible.scala index 470e9318ba0..9795a72e4ef 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Compatible.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Compatible.scala @@ -37,7 +37,7 @@ package com.normation.cfclerk.domain -import scala.xml._ +import scala.xml.* final case class OperatingSystem(name: String = "", version: String = "") { override def toString: String = if (version == "") name diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Errors.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Errors.scala index 1d609ed3dfb..9ca95d2297d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Errors.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Errors.scala @@ -38,7 +38,7 @@ package com.normation.cfclerk.domain import cats.data.NonEmptyList -import com.normation.errors._ +import com.normation.errors.* sealed trait LoadTechniqueError extends RudderError diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Technique.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Technique.scala index c58022d4fe7..e37b528abf5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Technique.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Technique.scala @@ -38,7 +38,7 @@ package com.normation.cfclerk.domain import com.normation.inventory.domain.AgentType -import com.normation.utils.Utils._ +import com.normation.utils.Utils.* /** * A name, used as an identifier, for a policy. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/TechniqueVersion.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/TechniqueVersion.scala index 3f41cdadf92..7157aed1e10 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/TechniqueVersion.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/TechniqueVersion.scala @@ -39,7 +39,7 @@ package com.normation.cfclerk.domain import com.normation.GitVersion import com.normation.GitVersion.Revision -import com.normation.utils._ +import com.normation.utils.* final case class TechniqueVersion protected (version: Version, rev: Revision) extends Ordered[TechniqueVersion] { def compare(v: TechniqueVersion): Int = (version compare v.version) match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala index dc533cf0f7f..d89798c8213 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSection.scala @@ -37,10 +37,10 @@ package com.normation.cfclerk.domain -import cats.implicits._ +import cats.implicits.* import com.normation.errors.Accumulated import com.normation.errors.PureResult -import scala.xml._ +import scala.xml.* /* A SectionChild is either a Variable or a Section*/ sealed trait SectionChild @@ -72,7 +72,7 @@ sealed trait Variable { */ def getValidatedValue(escape: String => String): PureResult[Seq[Any]] = { - import cats.implicits._ + import cats.implicits.* val accumulated = values.toList.traverse(x => castValue(x, escape).toValidatedNel) accumulated.fold( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala index 84629181749..0d9a1cbff41 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/VariableAndSectionSpec.scala @@ -37,8 +37,8 @@ package com.normation.cfclerk.domain -import cats.implicits._ -import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants._ +import cats.implicits.* +import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants.* import com.normation.cfclerk.xmlparsers.EmptyReportKeysValue import com.normation.errors.PureResult import com.normation.errors.Unexpected diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala index 1774a5036b4..8e34a660bdf 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueReader.scala @@ -37,11 +37,11 @@ package com.normation.cfclerk.services -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.errors.IOResult import java.io.InputStream import scala.collection.immutable.SortedMap -import scala.collection.mutable.{Map => MutMap} +import scala.collection.mutable.Map as MutMap final case class TechniquesInfo( rootCategory: RootTechniqueCategory, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueRepository.scala index 532b9c8811d..bb10b898cdd 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/TechniqueRepository.scala @@ -37,8 +37,8 @@ package com.normation.cfclerk.services -import com.normation.cfclerk.domain._ -import com.normation.errors._ +import com.normation.cfclerk.domain.* +import com.normation.errors.* import java.io.InputStream import scala.collection.SortedSet diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala index 4f9f40696b5..8b2f421c7d5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/GitTechniqueReader.scala @@ -38,24 +38,24 @@ package com.normation.cfclerk.services.impl import com.normation.GitVersion -import com.normation.cfclerk.domain._ -import com.normation.cfclerk.services._ -import com.normation.cfclerk.services.impl.GitTechniqueReader._ +import com.normation.cfclerk.domain.* +import com.normation.cfclerk.services.* +import com.normation.cfclerk.services.impl.GitTechniqueReader.* import com.normation.cfclerk.xmlparsers.TechniqueParser -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.domain.logger.TechniqueReaderLoggerPure import com.normation.rudder.git.ExactFileTreeFilter import com.normation.rudder.git.GitFindUtils import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.git.GitRevisionProvider import com.normation.rudder.repository.xml.TechniqueFiles -import com.normation.zio._ +import com.normation.zio.* import java.io.File import java.io.FileNotFoundException import java.io.InputStream import java.io.IOException import java.nio.charset.StandardCharsets -import net.liftweb.common._ +import net.liftweb.common.* import org.eclipse.jgit.diff.DiffEntry.ChangeType import org.eclipse.jgit.diff.DiffFormatter import org.eclipse.jgit.errors.MissingObjectException @@ -65,11 +65,11 @@ import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.treewalk.TreeWalk import org.xml.sax.SAXParseException import scala.collection.immutable.SortedMap -import scala.collection.mutable.{Map => MutMap} -import scala.jdk.CollectionConverters._ -import scala.xml._ -import zio._ -import zio.syntax._ +import scala.collection.mutable.Map as MutMap +import scala.jdk.CollectionConverters.* +import scala.xml.* +import zio.* +import zio.syntax.* /** * @@ -595,7 +595,7 @@ class GitTechniqueReader( } } } - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* prop.asScala.toMap } @@ -874,10 +874,10 @@ class GitTechniqueReader( // techniqueRelativePath is the path of the technique relative to /techniques/, not to git repo root. def checkTechniqueIdMatchesYaml(techniqueRelativePath: File, techniqueId: TechniqueId): Task[Unit] = { - import zio._ - import zio.json.yaml._ - import com.normation.rudder.ncf.yaml.{Technique => YamlTechnique} - import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer._ + import zio.* + import zio.json.yaml.* + import com.normation.rudder.ncf.yaml.Technique as YamlTechnique + import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer.* // looking at descriptor on file path, because it's what TechniqueCompiler will look at val descriptor = diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala index 9d0d6e5f0db..1df2f89fd59 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/TechniqueRepositoryImpl.scala @@ -37,9 +37,9 @@ package com.normation.cfclerk.services.impl -import com.normation.cfclerk.domain._ -import com.normation.cfclerk.services._ -import com.normation.errors._ +import com.normation.cfclerk.domain.* +import com.normation.cfclerk.services.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.domain.logger.TechniqueReaderLoggerPure @@ -47,9 +47,9 @@ import com.normation.utils.Control import com.normation.utils.StringUuidGenerator import java.io.File import java.io.InputStream -import net.liftweb.common._ +import net.liftweb.common.* import scala.collection.SortedSet -import zio.syntax._ +import zio.syntax.* class TechniqueRepositoryImpl( techniqueReader: TechniqueReader, @@ -102,7 +102,7 @@ class TechniqueRepositoryImpl( actor: EventActor, reason: Option[String] ): Box[Map[TechniqueName, TechniquesLibraryUpdateType]] = { - import TechniqueCategoryModType._ + import TechniqueCategoryModType.* try { val modifiedPackages = techniqueReader.getModifiedTechniques if (techniqueReader.needReload() || /* first time init */ null == techniqueInfosCache) { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/SectionSpecParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/SectionSpecParser.scala index 08cf2604dda..0d461676250 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/SectionSpecParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/SectionSpecParser.scala @@ -37,11 +37,11 @@ package com.normation.cfclerk.xmlparsers -import cats.implicits._ -import com.normation.cfclerk.domain._ -import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants._ -import net.liftweb.common._ -import scala.xml._ +import cats.implicits.* +import com.normation.cfclerk.domain.* +import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants.* +import net.liftweb.common.* +import scala.xml.* class SectionSpecParser(variableParser: VariableSpecParser) extends Loggable { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala index d238eb931e5..511d3caf364 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala @@ -37,15 +37,15 @@ package com.normation.cfclerk.xmlparsers -import cats.implicits._ +import cats.implicits.* import com.normation.NamedZioLogger -import com.normation.cfclerk.domain._ -import com.normation.cfclerk.domain.implicits._ +import com.normation.cfclerk.domain.* +import com.normation.cfclerk.domain.implicits.* import com.normation.cfclerk.services.SystemVariableSpecService -import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants._ +import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants.* import com.normation.inventory.domain.AgentType import scala.util.matching.Regex -import scala.xml._ +import scala.xml.* /** * Parse a technique (metadata.xml file) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala index d6c4c66a50a..96b9299d258 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala @@ -37,12 +37,12 @@ package com.normation.cfclerk.xmlparsers -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.cfclerk.domain.HashAlgoConstraint.DerivedPasswordType -import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants._ +import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants.* import com.normation.utils.Control -import net.liftweb.common._ -import scala.xml._ +import net.liftweb.common.* +import scala.xml.* object Utils { @@ -96,7 +96,7 @@ object Utils { } } -import Utils._ +import Utils.* final case class EmptyReportKeysValue(sectionName: String) extends Exception( s"In '${sectionName}', the element ${REPORT_KEYS} must have a non empty list of provided values: <${REPORT_KEYS}><${REPORT_KEYS_VALUE}>val foo<${REPORT_KEYS_VALUE}>..." diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlwriters/SectionSpecWriter.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlwriters/SectionSpecWriter.scala index 0e1b7034af8..d132224fbb7 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlwriters/SectionSpecWriter.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlwriters/SectionSpecWriter.scala @@ -1,9 +1,9 @@ package com.normation.cfclerk.xmlwriters -import com.normation.cfclerk.domain._ -import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants._ -import net.liftweb.common._ -import scala.xml._ +import com.normation.cfclerk.domain.* +import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants.* +import net.liftweb.common.* +import scala.xml.* trait SectionSpecWriter { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala index 8f28a3a480b..72fad843ca5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/eventlog/EventLog.scala @@ -22,7 +22,7 @@ package com.normation.eventlog import com.normation.utils.StringUuidGeneratorImpl import org.joda.time.DateTime -import scala.xml._ +import scala.xml.* final case class EventActor(name: String) extends AnyVal diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala index 4599bbc62d8..392e1e48bef 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala @@ -36,7 +36,7 @@ */ package com.normation.rudder.api -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.ldap.core.LDAPConstants @@ -54,11 +54,11 @@ import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.repository.ldap.LDAPDiffMapper import com.normation.rudder.repository.ldap.LDAPEntityMapper import com.normation.rudder.services.user.PersonIdentService -import com.normation.zio._ +import com.normation.zio.* import java.security.MessageDigest import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * A repository to retrieve API Accounts diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala index 526965ed35e..06b52f9078f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala @@ -36,8 +36,8 @@ */ package com.normation.rudder.api -import cats.data._ -import cats.implicits._ +import cats.data.* +import cats.implicits.* import com.normation.rudder.api.ApiToken.prefixV2 import com.normation.rudder.facts.nodes.NodeSecurityContext import java.nio.charset.StandardCharsets @@ -222,7 +222,7 @@ object AclPath { implicit val orderingaAclPath: Ordering[AclPath] = new Ordering[AclPath] { // compare: negative if x < y override def compare(x: AclPath, y: AclPath): Int = { - import AclPathSegment._ + import AclPathSegment.* if (x.parts.size == y.parts.size) { (x.parts.last, y.parts.last) match { case (p1, p2) if (p1 == p2) => 0 diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala index b7152b6749c..3c11f58f071 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala @@ -42,13 +42,13 @@ import com.normation.GitVersion.ParseRev import com.normation.GitVersion.Revision import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.PureResult import com.normation.errors.Unexpected import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupCategoryId import com.normation.rudder.domain.nodes.NodeGroupId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.CompareProperties import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GlobalParameter @@ -66,10 +66,10 @@ import com.normation.rudder.services.queries.JsonQueryLexer import com.normation.rudder.services.queries.StringCriterionLine import com.normation.rudder.services.queries.StringQuery import com.typesafe.config.ConfigValue -import io.scalaland.chimney.dsl._ -import net.liftweb.common._ +import io.scalaland.chimney.dsl.* +import net.liftweb.common.* import net.liftweb.http.Req -import zio.json._ +import zio.json.* /* * This class deals with everything serialisation related for API. @@ -338,9 +338,9 @@ object JsonQueryObjects { } trait RudderJsonDecoders { - import JsonQueryObjects._ - import JsonResponseObjects._ - import JsonResponseObjects.JRRuleTarget._ + import JsonQueryObjects.* + import JsonResponseObjects.* + import JsonResponseObjects.JRRuleTarget.* // JRRuleTarget object JRRuleTargetDecoder { @@ -366,7 +366,7 @@ trait RudderJsonDecoders { } } def extractRuleTargetJson(s: String): Either[String, JRRuleTarget] = { - import zio.json._ + import zio.json.* s.fromJson[JRRuleTarget] .orElse(RuleTarget.unserOne(s) match { case None => Left(s"Error: the following string can't not be decoded as a rule target: '${s}''") @@ -393,7 +393,7 @@ trait RudderJsonDecoders { implicit val techniqueVersionDecoder: JsonDecoder[TechniqueVersion] = JsonDecoder[String].mapOrFail(TechniqueVersion.parse(_)) implicit lazy val ruleCategoryIdDecoder: JsonDecoder[RuleCategoryId] = JsonDecoder[String].map(RuleCategoryId.apply) implicit lazy val directiveIdsDecoder: JsonDecoder[Set[DirectiveId]] = { - import cats.implicits._ + import cats.implicits.* JsonDecoder[List[String]].mapOrFail(list => list.traverse(x => DirectiveId.parse(x)).map(_.toSet)) } implicit val ruleIdIdDecoder: JsonDecoder[RuleId] = JsonDecoder[String].mapOrFail(x => RuleId.parse(x)) @@ -456,10 +456,10 @@ object ZioJsonExtractor { * We want to get ride of RestExtractorService but for now, we keep it for the parameter parts. */ class ZioJsonExtractor(queryParser: CmdbQueryParser with JsonQueryLexer) { - import JsonQueryObjects._ - import JsonResponseObjects._ + import JsonQueryObjects.* + import JsonResponseObjects.* import ZioJsonExtractor.parseJson - import implicits._ + import implicits.* /** * Utilities to extract values from params Map diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala index 547fed69b1f..0409b9db864 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala @@ -42,14 +42,14 @@ import com.normation.GitVersion.RevisionInfo import com.normation.cfclerk.domain.Technique import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.apidata.JsonResponseObjects.JRPropertyHierarchy.JRPropertyHierarchyHtml import com.normation.rudder.apidata.JsonResponseObjects.JRPropertyHierarchy.JRPropertyHierarchyJson import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupCategoryId import com.normation.rudder.domain.nodes.NodeGroupId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.properties.GroupProperty @@ -73,16 +73,16 @@ import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.rudder.services.queries.StringCriterionLine import com.normation.rudder.services.queries.StringQuery import com.normation.utils.DateFormaterService -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import com.typesafe.config.ConfigRenderOptions import com.typesafe.config.ConfigValue -import io.scalaland.chimney.dsl._ -import zio._ -import zio.{Tag => _} -import zio.json._ +import io.scalaland.chimney.dsl.* +import zio.* +import zio.Tag as _ +import zio.json.* import zio.json.DeriveJsonEncoder import zio.json.internal.Write -import zio.syntax._ +import zio.syntax.* /* * This class deals with everything serialisation related for API. @@ -600,7 +600,7 @@ object JsonResponseObjects { ) object JRGlobalParameter { - import GenericProperty._ + import GenericProperty.* def empty(name: String): JRGlobalParameter = JRGlobalParameter(None, name, "".toConfigValue, "", None, None) def fromGlobalParameter(p: GlobalParameter, crId: Option[ChangeRequestId]): JRGlobalParameter = { JRGlobalParameter(crId.map(_.value.toString), p.name, p.value, p.description, p.inheritMode, p.provider) @@ -905,8 +905,8 @@ object JsonResponseObjects { //////////////////////////// zio-json encoders //////////////////////////// trait RudderJsonEncoders { - import JsonResponseObjects._ - import JsonResponseObjects.JRRuleTarget._ + import JsonResponseObjects.* + import JsonResponseObjects.JRRuleTarget.* implicit lazy val stringTargetEnc: JsonEncoder[JRRuleTargetString] = JsonEncoder[String].contramap(_.r.target) implicit lazy val andTargetEnc: JsonEncoder[JRRuleTargetComposition.or] = JsonEncoder[List[JRRuleTarget]].contramap(_.list) @@ -1004,7 +1004,7 @@ trait RudderJsonEncoders { * Decoders for JsonResponse object, when you need to read back something that they serialized. */ object JsonResponseObjectDecodes extends RudderJsonDecoders { - import JsonResponseObjects._ + import JsonResponseObjects.* implicit lazy val decodeJRParentProperty: JsonDecoder[JRParentProperty] = DeriveJsonDecoder.gen implicit lazy val decodeJRPropertyHierarchy: JsonDecoder[JRPropertyHierarchy] = DeriveJsonDecoder.gen diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/NodeDetailLevel.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/NodeDetailLevel.scala index e5d0e46906e..7116c9027f0 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/NodeDetailLevel.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/NodeDetailLevel.scala @@ -37,12 +37,12 @@ package com.normation.rudder.apidata -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.rudder.domain.logger.ApiLogger import com.normation.rudder.domain.nodes.NodeInfo import com.normation.utils.DateFormaterService -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import org.joda.time.DateTime sealed trait NodeDetailLevel { @@ -367,8 +367,8 @@ object NodeDetailLevel { } val softwareUpdate: FullInventory => JValue = { - import com.normation.inventory.domain.JsonSerializers.implicits._ - import com.normation.json._ + import com.normation.inventory.domain.JsonSerializers.implicits.* + import com.normation.json.* (inv: FullInventory) => JArray(inv.node.softwareUpdates.flatMap { su => su.toLiftJson match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala index 84bdadf1077..f30758e696b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala @@ -37,25 +37,25 @@ package com.normation.rudder.apidata -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.cfclerk.services.TechniqueRepository -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.domain.NodeId import com.normation.rudder.api.ApiAccount -import com.normation.rudder.api.ApiAccountKind.{PublicApi => PublicApiAccount} +import com.normation.rudder.api.ApiAccountKind.PublicApi as PublicApiAccount import com.normation.rudder.api.ApiAccountKind.System import com.normation.rudder.api.ApiAccountKind.User -import com.normation.rudder.api.ApiAuthorization.{None => NoAccess} import com.normation.rudder.api.ApiAuthorization.ACL +import com.normation.rudder.api.ApiAuthorization.None as NoAccess import com.normation.rudder.api.ApiAuthorization.RO import com.normation.rudder.api.ApiAuthorization.RW import com.normation.rudder.api.ApiVersion -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.properties._ +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.properties.* import com.normation.rudder.domain.queries.Query import com.normation.rudder.domain.servers.Srv -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.repository.FullActiveTechnique import com.normation.rudder.repository.FullNodeGroupCategory import com.normation.rudder.rule.category.RuleCategory @@ -66,9 +66,9 @@ import com.normation.rudder.services.healthcheck.HealthcheckResult.Ok import com.normation.rudder.services.healthcheck.HealthcheckResult.Warning import com.normation.rudder.services.modification.DiffService import com.normation.utils.DateFormaterService -import net.liftweb.common._ -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.common.* +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import org.joda.time.DateTime import zio.json.ast.Json import zio.json.ast.Json.Str diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala index 1d711a38857..8a6872a2180 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AbstractScheduler.scala @@ -41,7 +41,7 @@ import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.domain.logger.ScheduledJobLogger import net.liftweb.actor.LAPinger import net.liftweb.actor.SpecializedLiftActor -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat import scala.concurrent.duration.Duration diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncDeploymentActor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncDeploymentActor.scala index 55934ca7dcf..eb176bb5ef8 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncDeploymentActor.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AsyncDeploymentActor.scala @@ -37,7 +37,7 @@ package com.normation.rudder.batch -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.errors.PureResult import com.normation.errors.Unexpected @@ -46,21 +46,21 @@ import com.normation.eventlog.EventLog import com.normation.eventlog.EventLogDetails import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.domain.logger.PolicyGenerationLogger import com.normation.rudder.domain.logger.PolicyGenerationLoggerPure import com.normation.rudder.services.eventlog.EventLogDeploymentService import com.normation.rudder.services.marshalling.DeploymentStatusSerialisation import com.normation.rudder.services.policies.PromiseGenerationService -import com.normation.zio._ -import net.liftweb.actor._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.actor.* +import net.liftweb.common.* import net.liftweb.http.ListenerManager -import org.joda.time._ +import org.joda.time.* import scala.concurrent.duration.Duration import scala.xml.NodeSeq -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* sealed trait StartDeploymentMessage diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportLogger.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportLogger.scala index 7cbbfe36558..309c2834377 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportLogger.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportLogger.scala @@ -37,7 +37,7 @@ package com.normation.rudder.batch -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.AllReportLogger import com.normation.rudder.domain.logger.ScheduledJobLogger @@ -52,9 +52,9 @@ import com.normation.rudder.repository.ReportsRepository import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.RoRuleRepository import com.normation.rudder.repository.RudderPropertiesRepository -import com.normation.zio._ -import net.liftweb.actor._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.actor.* +import net.liftweb.common.* import scala.collection.MapView /** @@ -248,7 +248,7 @@ class AutomaticReportLogger( // don't blow the stack def maxTry(tried: Int): Unit = { propertyRepository.updateReportLoggerLastId(newId) match { - case f: Full[_] => + case f: Full[?] => // ok, nothing to do case eb: EmptyBox => if (tried >= 5) { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportsCleaner.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportsCleaner.scala index 8c111bb845c..32fa46282f0 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportsCleaner.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/AutomaticReportsCleaner.scala @@ -44,18 +44,18 @@ import com.normation.rudder.domain.logger.ReportLogger import com.normation.rudder.domain.logger.ReportLoggerPure import com.normation.rudder.domain.logger.ScheduledJobLogger import com.normation.rudder.domain.logger.ScheduledJobLoggerPure -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.services.system.DatabaseManager import com.normation.rudder.services.system.DeleteCommand -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN import net.liftweb.actor.LAPinger import net.liftweb.actor.SpecializedLiftActor -import net.liftweb.common._ -import org.joda.time._ +import net.liftweb.common.* +import org.joda.time.* import scala.annotation.nowarn -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * An helper object designed to help building automatic reports cleaning @@ -144,8 +144,8 @@ object AutomaticReportsCleaning { // what we are looking for in node run interval JSON final case class RunInterval(interval: Int) def getMaxRunMinutes(ldapCon: LDAPConnectionProvider[RoLDAPConnection]): IOResult[Int] = { - import com.normation.ldap.sdk._ - import net.liftweb.json._ + import com.normation.ldap.sdk.* + import net.liftweb.json.* implicit val format = DefaultFormats val runIntervalAttr = "serializedAgentRunInterval" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/CleanupUsers.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/CleanupUsers.scala index 76fc57a499e..539d87c261d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/CleanupUsers.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/CleanupUsers.scala @@ -39,13 +39,13 @@ package com.normation.rudder.batch import com.normation.rudder.domain.eventlog.RudderEventActor import com.normation.rudder.domain.logger.ApplicationLoggerPure -import com.normation.rudder.users._ -import com.normation.utils.CronParser._ +import com.normation.rudder.users.* +import com.normation.utils.CronParser.* import com.normation.utils.DateFormaterService -import com.normation.zio._ +import com.normation.zio.* import cron4s.CronExpr import org.joda.time.DateTime -import zio._ +import zio.* /** * A scheduler which runs user accounts and user sessions clean-up: diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/GitGC.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/GitGC.scala index 28cf42a0530..c4703e965f0 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/GitGC.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/GitGC.scala @@ -40,12 +40,12 @@ package com.normation.rudder.batch import com.normation.errors.IOResult import com.normation.rudder.domain.logger.GitRepositoryLogger import com.normation.rudder.git.GitRepositoryProvider -import com.normation.utils.CronParser._ -import com.normation.zio._ +import com.normation.utils.CronParser.* +import com.normation.zio.* import cron4s.CronExpr import org.eclipse.jgit.lib.ProgressMonitor import org.joda.time.Duration -import zio._ +import zio.* /** * A scheduler which run a git gc every day. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeDeletedInventories.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeDeletedInventories.scala index f0579dde997..3884153704f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeDeletedInventories.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeDeletedInventories.scala @@ -44,7 +44,7 @@ import com.normation.rudder.services.servers.PurgeDeletedNodes import com.normation.zio.ZioRuntime import org.joda.time.DateTime import scala.concurrent.duration.FiniteDuration -import zio._ +import zio.* /** * A naive scheduler which checks every N days if old inventories are purged from LDAP "removed" tree. @@ -85,7 +85,7 @@ class PurgeDeletedInventories( val error = Chained(s"Error when purging deleted nodes inventories older than ${TTL} days", err) ScheduledJobLoggerPure.error(error.fullMsg) }) - import zio.Duration.{fromScala => zduration} + import zio.Duration.fromScala as zduration ZioRuntime.unsafeRun(prog.delay(zduration(updateInterval)).repeat(Schedule.spaced(zduration(updateInterval))).forkDaemon) } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeOldInventoryData.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeOldInventoryData.scala index f7e8eea6e1c..9be07abed79 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeOldInventoryData.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeOldInventoryData.scala @@ -41,12 +41,12 @@ import better.files.File import com.normation.errors.IOResult import com.normation.inventory.domain.InventoryProcessingLogger import com.normation.rudder.services.nodes.history.impl.InventoryHistoryJdbcRepository -import com.normation.utils.CronParser._ -import com.normation.zio._ +import com.normation.utils.CronParser.* +import com.normation.zio.* import cron4s.CronExpr import java.time.Instant import org.joda.time.DateTime -import zio._ +import zio.* /** * A scheduler which deletes old inventory data: diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeUnreferencedSoftwares.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeUnreferencedSoftwares.scala index 5fde22a271d..07e72922ed1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeUnreferencedSoftwares.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/PurgeUnreferencedSoftwares.scala @@ -39,10 +39,10 @@ package com.normation.rudder.batch import com.normation.inventory.ldap.core.SoftwareService import com.normation.rudder.domain.logger.ScheduledJobLogger -import com.normation.zio._ +import com.normation.zio.* import scala.annotation.nowarn import scala.concurrent.duration.FiniteDuration -import zio._ +import zio.* /** * A naive scheduler which checks every updateInterval if software needs to be deleted @@ -63,7 +63,7 @@ class PurgeUnreferencedSoftwares( s"[purge unreferenced software] starting batch that purge unreferenced softwares, every ${updateInterval.toString()}" ) val prog = softwareService.deleteUnreferencedSoftware() - import zio.Duration.{fromScala => zduration} + import zio.Duration.fromScala as zduration ZioRuntime.unsafeRun( prog.delay(1.hour).repeat(Schedule.spaced(zduration(updateInterval))).forkDaemon ): @nowarn( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/UpdateDynamicGroups.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/UpdateDynamicGroups.scala index 24809b8aeb8..a6f5cf875ea 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/UpdateDynamicGroups.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/batch/UpdateDynamicGroups.scala @@ -37,8 +37,8 @@ package com.normation.rudder.batch -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.Constants.DYNGROUP_MINIMUM_UPDATE_INTERVAL @@ -46,13 +46,13 @@ import com.normation.rudder.domain.eventlog.RudderEventActor import com.normation.rudder.domain.logger.DynamicGroupLoggerPure import com.normation.rudder.domain.logger.ScheduledJobLogger import com.normation.rudder.domain.nodes.NodeGroupId -import com.normation.rudder.services.queries._ +import com.normation.rudder.services.queries.* import com.normation.rudder.utils.ParseMaxParallelism import com.normation.utils.StringUuidGenerator import com.normation.utils.Utils.DateToIsoString -import net.liftweb.actor._ -import net.liftweb.common._ -import org.joda.time._ +import net.liftweb.actor.* +import net.liftweb.common.* +import org.joda.time.* //Message to send to the updater manager to start a new update of all dynamic groups or get results sealed trait GroupUpdateMessage diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala index 681adbbac68..10191af3ce1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignEventRepository.scala @@ -43,11 +43,11 @@ import doobie.Fragments import doobie.Meta import doobie.Read import doobie.Write -import doobie.implicits._ -import doobie.implicits.javasql._ +import doobie.implicits.* +import doobie.implicits.javasql.* import doobie.implicits.toSqlInterpolator import org.joda.time.DateTime -import zio.interop.catz._ +import zio.interop.catz.* trait CampaignEventRepository { def get(campaignEventId: CampaignEventId): IOResult[Option[CampaignEvent]] @@ -82,10 +82,10 @@ trait CampaignEventRepository { class CampaignEventRepositoryImpl(doobie: Doobie, campaignSerializer: CampaignSerializer) extends CampaignEventRepository { - import CampaignSerializer._ + import CampaignSerializer.* import Doobie.DateTimeMeta - import com.normation.rudder.db.json.implicits._ - import doobie._ + import com.normation.rudder.db.json.implicits.* + import doobie.* implicit val stateWrite: Meta[CampaignEventState] = new Meta(pgDecoderGet, pgEncoderPut) @@ -129,7 +129,7 @@ class CampaignEventRepositoryImpl(doobie: Doobie, campaignSerializer: CampaignSe asc: Option[String] ): IOResult[List[CampaignEvent]] = { - import cats.syntax.list._ + import cats.syntax.list.* val campaignIdQuery = campaignId.map(c => fr"campaignId = ${c.value}") val campaignTypeQuery = campaignType.toNel.map(c => Fragments.in(fr"campaignType", c)) val stateQuery = states.toNel.map(s => Fragments.in(fr"state->>'value'", s)) @@ -161,7 +161,7 @@ class CampaignEventRepositoryImpl(doobie: Doobie, campaignSerializer: CampaignSe } def saveCampaignEvent(c: CampaignEvent): IOResult[CampaignEvent] = { - import doobie._ + import doobie.* val query = { sql"""insert into CampaignEvents (eventId, campaignId, name, state, startDate, endDate, campaignType) values (${c}) | ON CONFLICT (eventId) DO UPDATE @@ -180,7 +180,7 @@ class CampaignEventRepositoryImpl(doobie: Doobie, campaignSerializer: CampaignSe beforeDate: Option[DateTime] = None ): IOResult[Unit] = { - import cats.syntax.list._ + import cats.syntax.list.* val eventIdQuery = id.map(c => fr"eventId = ${c.value}") val campaignIdQuery = campaignId.map(c => fr"campaignId = ${c.value}") val campaignTypeQuery = campaignType.map(c => fr"campaignType = ${c.value}") diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignRepository.scala index 14fc487ea8f..7b7cf8e05ac 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/CampaignRepository.scala @@ -41,8 +41,8 @@ import better.files.File import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.errors.Unexpected -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* trait CampaignRepository { def getAll(typeFilter: List[CampaignType], statusFilter: List[CampaignStatusValue]): IOResult[List[Campaign]] diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JSONReportsHandler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JSONReportsHandler.scala index 16ed294f0a6..ec23511377a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JSONReportsHandler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JSONReportsHandler.scala @@ -37,13 +37,13 @@ package com.normation.rudder.campaigns -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.rudder.domain.reports.Reports import com.normation.rudder.repository.ReportsRepository import com.normation.rudder.repository.RudderPropertiesRepository import com.normation.zio.currentTimeMillis -import zio._ +import zio.* trait JSONReportsHandler { def handle: PartialFunction[Reports, IOResult[Reports]] diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala index 651ad3320b3..72dbb5fd63e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/JsonCampaignSerializer.scala @@ -37,7 +37,7 @@ package com.normation.rudder.campaigns -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.utils.DateFormaterService @@ -50,7 +50,7 @@ import zio.json.EncoderOps import zio.json.JsonDecoder import zio.json.JsonEncoder import zio.json.ast.Json -import zio.syntax._ +import zio.syntax.* trait JSONTranslateCampaign { @@ -68,7 +68,7 @@ trait JSONTranslateCampaign { class CampaignSerializer { private[this] var tranlaters: List[JSONTranslateCampaign] = Nil - import CampaignSerializer._ + import CampaignSerializer.* def getJson(campaign: Campaign): ZIO[Any, RudderError, Json] = { tranlaters.map(_.getRawJson()).fold(Jsonbase) { case (a, b) => b orElse a }(campaign).flatMap { json => @@ -120,7 +120,7 @@ object CampaignSerializer { case SecondLast => -2 } }) - import scala.concurrent.duration._ + import scala.concurrent.duration.* implicit val durationEncoder: JsonEncoder[Duration] = JsonEncoder[Long].contramap(_.toMillis) implicit val statusInfoEncoder: JsonEncoder[CampaignStatus] = DeriveJsonEncoder.gen implicit val dayTime: JsonEncoder[DayTime] = DeriveJsonEncoder.gen diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/MainCampaignService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/MainCampaignService.scala index de1f9c66b5b..06674687b75 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/MainCampaignService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/campaigns/MainCampaignService.scala @@ -37,7 +37,7 @@ package com.normation.rudder.campaigns -import cats.implicits._ +import cats.implicits.* import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.errors.RudderError @@ -48,7 +48,7 @@ import scala.annotation.nowarn import zio.Duration import zio.Queue import zio.ZIO -import zio.syntax._ +import zio.syntax.* trait CampaignHandler { def handle(mainCampaignService: MainCampaignService, event: CampaignEvent): PartialFunction[Campaign, IOResult[CampaignEvent]] diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/configuration/ConfigurationRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/configuration/ConfigurationRepository.scala index fa148fe43bf..ef10eb0f176 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/configuration/ConfigurationRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/configuration/ConfigurationRepository.scala @@ -61,8 +61,8 @@ import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.RoRuleRepository import com.normation.rudder.repository.xml.TechniqueRevisionRepository -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * Easier te manage data diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/DB.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/DB.scala index 6fd9fc6eb50..050a1aad76e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/DB.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/DB.scala @@ -37,16 +37,16 @@ package com.normation.rudder.db -import cats.implicits._ +import cats.implicits.* import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId -import com.normation.rudder.db.Doobie._ +import com.normation.rudder.db.Doobie.* import com.normation.rudder.domain.reports.NodeConfigId import com.normation.rudder.git.GitCommitId -import com.normation.rudder.reports.execution.{AgentRun => RudderAgentRun} +import com.normation.rudder.reports.execution.AgentRun as RudderAgentRun import com.normation.rudder.reports.execution.AgentRunId import com.normation.rudder.reports.execution.AgentRunWithoutCompliance -import doobie._ +import doobie.* import org.joda.time.DateTime /* diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala index 3fbb6302bbc..6f8c57938bc 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala @@ -38,32 +38,32 @@ package com.normation.rudder.db import cats.Show -import cats.data._ +import cats.data.* import com.normation.NamedZioLogger -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.services.reports.RunAndConfigInfo -import com.normation.zio._ -import doobie._ -import doobie.implicits.javasql._ -import doobie.postgres.implicits._ +import com.normation.zio.* +import doobie.* +import doobie.implicits.javasql.* +import doobie.postgres.implicits.* import doobie.util.log.ExecFailure import doobie.util.log.LogEvent import doobie.util.log.ProcessingFailure import doobie.util.transactor import java.sql.SQLXML import javax.sql.DataSource -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime import org.postgresql.util.PGobject import scala.xml.Elem import scala.xml.XML -import zio._ -import zio.interop.catz._ +import zio.* +import zio.interop.catz.* import zio.json.JsonDecoder import zio.json.JsonEncoder import zio.json.ast.Json @@ -227,7 +227,7 @@ object Doobie { * Do not use that one for extraction, only to save NodeExpectedReports */ implicit val SerializeNodeExpectedReportsWrite: Write[NodeExpectedReports] = { - import ExpectedReportsSerialisation._ + import ExpectedReportsSerialisation.* Write[(NodeId, NodeConfigId, DateTime, Option[DateTime], String)].contramap(ner => (ner.nodeId, ner.nodeConfigId, ner.beginDate, ner.endDate, ner.toCompactJson) ) @@ -238,7 +238,7 @@ object Doobie { * at each format update. We need to enforce that. */ implicit val DeserializeNodeExpectedReportsRead: Read[Either[(NodeId, NodeConfigId, DateTime), NodeExpectedReports]] = { - import ExpectedReportsSerialisation._ + import ExpectedReportsSerialisation.* Read[(NodeId, NodeConfigId, DateTime, Option[DateTime], String)].map(tuple => { parseJsonNodeExpectedReports(tuple._5) match { case Full(x) => @@ -250,23 +250,23 @@ object Doobie { } implicit val CompliancePercentWrite: Write[CompliancePercent] = { - import ComplianceLevelSerialisation._ - import net.liftweb.json._ + import ComplianceLevelSerialisation.* + import net.liftweb.json.* Write[String].contramap(x => compactRender(x.toJson)) } implicit val ComplianceRunInfoComposite: Write[(RunAndConfigInfo, RunComplianceInfo)] = { - import NodeStatusReportSerialization._ + import NodeStatusReportSerialization.* Write[String].contramap(_.toCompactJson) } implicit val AggregatedStatusReportComposite: Write[AggregatedStatusReport] = { - import NodeStatusReportSerialization._ + import NodeStatusReportSerialization.* Write[String].contramap(_.toCompactJson) } implicit val SetRuleNodeStatusReportComposite: Write[Set[RuleNodeStatusReport]] = { - import NodeStatusReportSerialization._ + import NodeStatusReportSerialization.* Write[String].contramap(_.toCompactJson) } @@ -295,7 +295,7 @@ package object json { trait JsonInstances { - import doobie.util._ + import doobie.util.* import zio.json.DecoderOps import zio.json.EncoderOps import zio.json.ast.Json.Null diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/NodeDit.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/NodeDit.scala index 4e18def9901..196f7ee5069 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/NodeDit.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/NodeDit.scala @@ -37,12 +37,12 @@ package com.normation.rudder.domain -import RudderLDAPConstants._ -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.unboundid.ldap.sdk._ +import RudderLDAPConstants.* +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.unboundid.ldap.sdk.* class NodeDit(val BASE_DN: DN) extends AbstractDit { dit => @@ -63,13 +63,13 @@ class NodeDit(val BASE_DN: DN) extends AbstractDit { def nodeModel(uuid: NodeId): LDAPEntry = { val mod = LDAPEntry(this.dn(uuid.value)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RUDDER_NODE).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RUDDER_NODE).toSeq*) mod } def policyServerNodeModel(id: NodeId): LDAPEntry = { val mod = LDAPEntry(this.dn(id.value)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_POLICY_SERVER_NODE).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_POLICY_SERVER_NODE).toSeq*) mod } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala index 068eeae4ee9..e932b4ef19a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala @@ -38,26 +38,26 @@ package com.normation.rudder.domain import com.normation.GitVersion -import com.normation.GitVersion._ -import com.normation.cfclerk.domain._ -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.syntax._ +import com.normation.GitVersion.* +import com.normation.cfclerk.domain.* +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.syntax.* import com.normation.rudder.api.ApiAccountId -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.appconfig.RudderWebPropertyName -import com.normation.rudder.domain.archives._ +import com.normation.rudder.domain.archives.* import com.normation.rudder.domain.nodes.NodeGroupCategoryId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.queries.Query import com.normation.rudder.repository.ActiveTechniqueLibraryArchiveId import com.normation.rudder.repository.NodeGroupLibraryArchiveId import com.normation.rudder.rule.category.RuleCategoryId -import com.unboundid.ldap.sdk._ -import net.liftweb.common._ -import net.liftweb.json._ +import com.unboundid.ldap.sdk.* +import net.liftweb.common.* +import net.liftweb.json.* class CATEGORY( val uuid: String, @@ -73,7 +73,7 @@ class CATEGORY( lazy val dn = new DN(rdn, parentDN) def model: LDAPEntry = { val mod = LDAPEntry(dn) - mod.resetValuesTo(A_OC, OC.objectClassNames(objectClass).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(objectClass).toSeq*) mod.resetValuesTo(A_NAME, name) mod.resetValuesTo(A_DESCRIPTION, description) mod.resetValuesTo(A_IS_SYSTEM, isSystem.toLDAPString) @@ -236,7 +236,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { isSystem: Boolean ): LDAPEntry = { val mod = LDAPEntry(new DN(buildRDN(uuid), parentDN)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_ACTIVE_TECHNIQUE).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_ACTIVE_TECHNIQUE).toSeq*) mod.resetValuesTo(A_TECHNIQUE_UUID, techniqueName.value) mod.resetValuesTo(A_IS_ENABLED, isEnabled.toLDAPString) mod.resetValuesTo(A_IS_SYSTEM, isSystem.toLDAPString) @@ -250,7 +250,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { def directiveModel(uuid: DirectiveUid, rev: Revision, techniqueVersion: TechniqueVersion, parentDN: DN): LDAPEntry = { val mod = LDAPEntry(RudderDit.buildDN(parentDN, A_DIRECTIVE_UUID, uuid.value, rev)) mod.resetValuesTo(A_TECHNIQUE_VERSION, techniqueVersion.serialize) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_DIRECTIVE).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_DIRECTIVE).toSeq*) mod } @@ -265,7 +265,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { def ruleModel(id: RuleId, name: String, isEnabled: Boolean, isSystem: Boolean, category: String): LDAPEntry = { val mod = LDAPEntry(configRuleDN(id)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RULE).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RULE).toSeq*) mod.resetValuesTo(A_NAME, name) mod.resetValuesTo(A_IS_ENABLED, isEnabled.toLDAPString) mod.resetValuesTo(A_IS_SYSTEM, isSystem.toLDAPString) @@ -312,7 +312,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { isSystem: Boolean = false ): LDAPEntry = { val mod = LDAPEntry(ruleCategory.ruleCategoryDN(uuid, parentDN)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RULE_CATEGORY).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RULE_CATEGORY).toSeq*) mod.resetValuesTo(A_NAME, name) mod.resetValuesTo(A_DESCRIPTION, description) mod.resetValuesTo(A_IS_SYSTEM, isSystem.toLDAPString) @@ -335,7 +335,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { ): LDAPEntry = { val mod = LDAPEntry(new DN(ruleTargetDN(uuid), parentDN)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_SPECIAL_TARGET).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_SPECIAL_TARGET).toSeq*) mod.resetValuesTo(A_NAME, name) mod.resetValuesTo(A_DESCRIPTION, description) mod.resetValuesTo(A_IS_SYSTEM, isSystem.toLDAPString) @@ -395,13 +395,13 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { isSystem: Boolean ): LDAPEntry = { val mod = LDAPEntry(group.groupDN(uuid, parentDN)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RUDDER_NODE_GROUP).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_RUDDER_NODE_GROUP).toSeq*) mod.resetValuesTo(A_NAME, name) mod.resetValuesTo(A_DESCRIPTION, description) mod.resetValuesTo(A_IS_ENABLED, isEnabled.toLDAPString) mod.resetValuesTo(A_IS_SYSTEM, isSystem.toLDAPString) mod.resetValuesTo(A_IS_DYNAMIC, isDynamic.toLDAPString) - mod.resetValuesTo(A_NODE_UUID, srvList.map(x => x.value).toSeq: _*) + mod.resetValuesTo(A_NODE_UUID, srvList.map(x => x.value).toSeq*) query match { case None => // No query to add. Maybe we'd like to enforce that it is not activated @@ -465,7 +465,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { def model: LDAPEntry = { val mod = LDAPEntry(dn) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_NODES_CONFIG).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_NODES_CONFIG).toSeq*) mod } @@ -520,7 +520,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { name: String ): LDAPEntry = { val mod = LDAPEntry(parameterDN(name)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_PARAMETER).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_PARAMETER).toSeq*) mod } } @@ -541,7 +541,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit { name: RudderWebPropertyName ): LDAPEntry = { val mod = LDAPEntry(propertyDN(name)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_PROPERTY).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_PROPERTY).toSeq*) mod } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala index 181e886688c..f89e12faf60 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala @@ -38,7 +38,7 @@ package com.normation.rudder.domain import com.normation.cfclerk.domain.Variable -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.rudder.services.policies.ParameterForConfiguration import com.normation.utils.Utils import net.liftweb.common.Loggable diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/categories/CategoryEntity.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/categories/CategoryEntity.scala index ea65ba2507b..75ea98fb292 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/categories/CategoryEntity.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/categories/CategoryEntity.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.categories -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* /** * A category in the LDAP. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala index fb3c701a1ef..021b3e14b8f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ArchiveEventLog.scala @@ -37,11 +37,11 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* import com.normation.rudder.domain.Constants import com.normation.rudder.git.GitArchiveId import com.normation.rudder.git.GitCommitId -import scala.xml._ +import scala.xml.* sealed trait ImportExportEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = ImportExportItemsLogCategory } @@ -64,7 +64,7 @@ object ImportExportEventLog { {gitArchiveId.commit.value} {gitArchiveId.commiter.getName} {gitArchiveId.commiter.getEmailAddress} - ): _* + )* ) ) } @@ -79,7 +79,7 @@ object ImportExportEventLog { minimizeEmpty = false, child = ( {gitCommitId.value} - ): _* + )* ) ) ) @@ -403,7 +403,7 @@ object Rollback extends EventLogFilter { } events ++ main - }: _* + }* ) ) } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala index 6d119d02739..a2143369499 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.Constants import com.normation.rudder.domain.nodes.NodeInfo diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala index 5559a84c1b8..c6a90b5f7fe 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ChangeRequestEventLog.scala @@ -1,6 +1,6 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* import com.normation.rudder.domain.policies.SimpleDiff import com.normation.rudder.domain.workflows.ChangeRequest diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala index b5b1cd1932b..bf189419bd6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/DirectiveEventLog.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* sealed trait DirectiveEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = DirectiveLogCategory } final case class AddDirective( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/EventLogCategories.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/EventLogCategories.scala index fe9dc65a4a6..af8f916f666 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/EventLogCategories.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/EventLogCategories.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* ///// Define intersting categories ///// case object UserLogCategory extends EventLogCategory diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala index 8c63f98028c..c23846fd1cd 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ModifyGlobalProperty.scala @@ -1,6 +1,6 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* final case class ModifyGlobalProperty( eventType: ModifyGlobalPropertyEventType, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala index 85230e508be..f35f21ca316 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeEventLog.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* sealed trait NodeEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = NodeLogCategory } final case class ModifyNode( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala index 175a5ec093d..2ce7a6a5556 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/NodeGroupEventLog.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* sealed trait NodeGroupEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = NodeGroupLogCategory } final case class AddNodeGroup( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala index 6da622e14e2..7dc108af300 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/ParameterEventLog.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* sealed trait ParameterEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = ParameterLogCategory } final case class AddGlobalParameter( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala index 9601dfce2d6..d928b4ee1a6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/PromisesEventLog.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* sealed trait PromiseEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = DeploymentLogCategory } final case class AutomaticStartDeployement( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala index 9d407cbbdba..ef260c409a3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/RuleEventLog.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* sealed trait RuleEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = RuleLogCategory } final case class AddRule( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala index 4a268a75882..76959b4f503 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/TechniqueEventLog.scala @@ -37,17 +37,17 @@ package com.normation.rudder.domain.eventlog -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.cfclerk.services.TechniqueDeleted import com.normation.cfclerk.services.TechniquesLibraryUpdateType import com.normation.cfclerk.services.TechniqueUpdated import com.normation.cfclerk.services.VersionAdded import com.normation.cfclerk.services.VersionDeleted import com.normation.cfclerk.services.VersionUpdated -import com.normation.eventlog._ +import com.normation.eventlog.* import com.normation.eventlog.EventLogDetails import com.normation.rudder.domain.Constants -import scala.xml._ +import scala.xml.* sealed trait TechniqueEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = TechniqueLogCategory } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala index 196f513e5c1..62ffc3c9780 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/WorkflowEventLog.scala @@ -1,6 +1,6 @@ package com.normation.rudder.domain.eventlog -import com.normation.eventlog._ +import com.normation.eventlog.* sealed trait WorkflowEventLog extends EventLog { final override val eventLogCategory: EventLogCategory = WorkflowLogCategory } final case class WorkflowStepChanged( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala index a2ca263a0de..054faf6f2ec 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugComplianceLogger.scala @@ -47,7 +47,7 @@ import com.normation.rudder.domain.reports.NodeExpectedReports import com.normation.rudder.reports.ChangesOnly import com.normation.rudder.reports.ComplianceMode import com.normation.rudder.reports.ResolvedAgentRunInterval -import com.normation.rudder.services.reports._ +import com.normation.rudder.services.reports.* import com.normation.utils.Utils.DateToIsoString import java.util.concurrent.TimeUnit import net.liftweb.common.Logger diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugNodeConfigurationLogger.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugNodeConfigurationLogger.scala index 298a6892d55..175b145435c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugNodeConfigurationLogger.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/DebugNodeConfigurationLogger.scala @@ -42,7 +42,7 @@ import com.normation.rudder.services.policies.NodeConfiguration import com.normation.utils.Control.traverse import java.io.File import java.io.PrintWriter -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.json.Serialization.writePretty import org.joda.time.DateTime import org.slf4j @@ -82,7 +82,7 @@ class NodeConfigurationLoggerImpl( } def log(nodeConfiguration: Seq[NodeConfiguration]): Box[Set[NodeId]] = { - import net.liftweb.json._ + import net.liftweb.json.* implicit val formats = DefaultFormats def writeIn[T](path: File)(f: PrintWriter => Box[T]) = { val printWriter = new java.io.PrintWriter(path) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/NonCompliantReportLogger.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/NonCompliantReportLogger.scala index 3190f9f0195..5c8baf8fcea 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/NonCompliantReportLogger.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/NonCompliantReportLogger.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.logger -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import net.liftweb.common.Logger import org.slf4j import org.slf4j.LoggerFactory @@ -49,7 +49,7 @@ object AllReportLogger extends Logger { override protected def _logger: slf4j.Logger = LoggerFactory.getLogger("non-compliant-reports") def FindLogger(reportType: String): ((=> AnyRef) => Unit) = { - import Reports._ + import Reports.* reportType match { // error diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala index 1290371917b..648b3b9a997 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala @@ -37,26 +37,26 @@ package com.normation.rudder.domain.nodes -import com.normation.box._ -import com.normation.errors._ -import com.normation.inventory.domain._ +import com.normation.box.* +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.rudder.domain.Constants import com.normation.rudder.domain.logger.PolicyGenerationLogger -import com.normation.zio._ +import com.normation.zio.* import java.io.StringReader import java.security.KeyFactory import java.security.MessageDigest import java.security.interfaces.RSAPublicKey import java.security.spec.X509EncodedKeySpec -import net.liftweb.common._ +import net.liftweb.common.* import org.apache.commons.codec.binary.Base64 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo import org.bouncycastle.openssl.PEMParser import org.bouncycastle.util.encoders.Hex import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* final case class MachineInfo( id: MachineUuid, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Directive.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Directive.scala index 00d0753eec5..818e71c450e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Directive.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Directive.scala @@ -41,7 +41,7 @@ import com.normation.GitVersion import com.normation.GitVersion.Revision import com.normation.cfclerk.domain.SectionSpec import com.normation.cfclerk.domain.TechniqueVersion -import scala.xml._ +import scala.xml.* /* * Two way of modeling the couple (directiveId, rev) : diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/PolicyMode.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/PolicyMode.scala index 3c16c1467c2..f5ecf68c70c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/PolicyMode.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/PolicyMode.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.policies import ca.mrvisser.sealerate.values -import com.normation.errors._ +import com.normation.errors.* sealed trait PolicyMode { def name: String } object PolicyMode { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala index d78b93b8d8d..5229f38d6e2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/RuleTarget.scala @@ -41,9 +41,9 @@ import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.utils.Control.traverse -import net.liftweb.common._ -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.common.* +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import scala.collection.MapView import scala.util.matching.Regex import zio.Chunk diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala index 205000898bb..d59cfcf871f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/SimpleDiff.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.policies -import scala.xml._ +import scala.xml.* /** * Define a "simple diff value holder", a container for the diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala index 8adce515c42..2acd8612c68 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/Tags.scala @@ -38,7 +38,7 @@ package com.normation.rudder.domain.policies import com.normation.rudder.repository.json.DataExtractor.CompleteJson import com.normation.rudder.repository.json.JsonExtractorUtils -import net.liftweb.common._ +import net.liftweb.common.* /** * Tags that apply on Rules and Directives @@ -73,8 +73,8 @@ object Tags { object JsonTagSerialisation { - import net.liftweb.json._ - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.* + import net.liftweb.json.JsonDSL.* def serializeTags(tags: Tags): JValue = { @@ -89,7 +89,7 @@ object JsonTagSerialisation { } trait JsonTagExtractor[M[_]] extends JsonExtractorUtils[M] { - import net.liftweb.json._ + import net.liftweb.json.* def unserializeTags(value: String): Box[M[Tags]] = { parseOpt(value) match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala index bca6b4feb01..ec37883b2a9 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala @@ -39,16 +39,16 @@ package com.normation.rudder.domain.properties import com.normation.GitVersion import com.normation.GitVersion.Revision -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.CustomProperty import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.services.policies.ParameterEntry -import com.typesafe.config._ +import com.typesafe.config.* import java.util.regex.Pattern -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* /* * A property provider is the thing responsible for that property. @@ -164,8 +164,8 @@ final case class PatchProperty( * Provider, if not provided will return None * This trait provides update methods for generic processing (since we don't have case class compiler support). */ -sealed trait GenericProperty[P <: GenericProperty[_]] { - import GenericProperty._ +sealed trait GenericProperty[P <: GenericProperty[?]] { + import GenericProperty.* def config: Config def fromConfig(v: Config): P @@ -317,12 +317,12 @@ object GenericProperty { * Merge two json values, overriding or merging recursively */ def mergeValues(oldValue: ConfigValue, newValue: ConfigValue, mode: InheritMode): ConfigValue = { - import ConfigValueType._ - import InheritMode._ + import ConfigValueType.* + import InheritMode.* - import java.util.{List => juList} - import java.util.{Map => juMap} - import scala.jdk.CollectionConverters._ + import java.util.List as juList + import java.util.Map as juMap + import scala.jdk.CollectionConverters.* def stringPlus(a: ConfigValue, b: ConfigValue): ConfigValue = { ConfigValueFactory.fromAnyRef(a.unwrapped().asInstanceOf[String] + b.unwrapped().asInstanceOf[String]) @@ -486,7 +486,7 @@ object GenericProperty { * Parse a JSON JValue to ConfigValue. It always succeeds. */ def fromJsonValue(value: JValue): ConfigValue = { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* value match { case JNothing | JNull => ConfigValueFactory.fromAnyRef("") case JString(s) => ConfigValueFactory.fromAnyRef(s) @@ -502,9 +502,9 @@ object GenericProperty { } } def fromZioJson(value: zio.json.ast.Json): ConfigValue = { - import zio.json.ast.Json._ + import zio.json.ast.Json.* - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* value match { case Null => ConfigValueFactory.fromAnyRef("") case Str(s) => @@ -607,7 +607,7 @@ object GenericProperty { } } - implicit class RenderProperty(val p: GenericProperty[_]) extends AnyVal { + implicit class RenderProperty(val p: GenericProperty[?]) extends AnyVal { // get the json string for the property, what you likely want def valueAsString: String = GenericProperty.serializeToJson(p.value) // get the Hocon string, with comments if any @@ -632,18 +632,18 @@ object GenericProperty { def toConfigValue: ConfigValue = ConfigValueFactory.fromAnyRef(x.value) } implicit class IterableToConfig[T](val x: Iterable[T]) extends AnyVal { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* def toConfigValue: ConfigValue = ConfigValueFactory.fromIterable(x.asJava) } implicit class MapToConfig[T](val x: Map[String, T]) extends AnyVal { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* def toConfigValue: ConfigValue = ConfigValueFactory.fromMap(x.asJava) } /* * Implicit class to render properties to JSON */ - implicit class PropertyToJson(val x: GenericProperty[_]) extends AnyVal { + implicit class PropertyToJson(val x: GenericProperty[?]) extends AnyVal { def toJson: JObject = ( ("name" -> x.name) ~ ("value" -> parse(x.value.render(ConfigRenderOptions.concise()))) @@ -654,7 +654,7 @@ object GenericProperty { def toData: String = x.config.root().render(ConfigRenderOptions.concise().setComments(true)) } - implicit class JsonProperties(val props: Seq[GenericProperty[_]]) extends AnyVal { + implicit class JsonProperties(val props: Seq[GenericProperty[?]]) extends AnyVal { implicit def formats: DefaultFormats.type = DefaultFormats def toApiJson: JArray = { @@ -750,7 +750,7 @@ object GroupProperty { } object CompareProperties { - import cats.implicits._ + import cats.implicits.* /** * Update a set of properties with the map: @@ -869,8 +869,8 @@ object ParentProperty { */ object JsonPropertySerialisation { - import net.liftweb.json._ - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.* + import net.liftweb.json.JsonDSL.* implicit class ParentPropertyToJSon(val p: ParentProperty) extends AnyVal { def toJson: JValue = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala index b6408fd4292..3491c205b56 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala @@ -37,36 +37,36 @@ package com.normation.rudder.domain.queries -import cats.implicits._ +import cats.implicits.* import com.jayway.jsonpath.JsonPath -import com.normation.errors._ -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.errors.* +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.nodes.NodeInfo import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.domain.properties.NodeProperty -import com.normation.rudder.services.queries._ -import com.normation.zio._ -import com.unboundid.ldap.sdk._ +import com.normation.rudder.services.queries.* +import com.normation.zio.* +import com.unboundid.ldap.sdk.* import java.util.Locale import java.util.regex.PatternSyntaxException -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.SHtml -import net.liftweb.http.SHtml.ElemAttr._ +import net.liftweb.http.SHtml.ElemAttr.* import net.liftweb.http.SHtml.SelectableOption -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat import org.joda.time.format.DateTimeFormatter -import scala.xml._ +import scala.xml.* sealed trait CriterionComparator { val id: String @@ -165,7 +165,7 @@ sealed trait CriterionType extends ComparatorList { * for the field. * DO NOT FORGET TO USE attrs ! (especially 'id') */ - def toForm(value: String, func: String => Any, attrs: (String, String)*): Elem = SHtml.text(value, func, attrs: _*) + def toForm(value: String, func: String => Any, attrs: (String, String)*): Elem = SHtml.text(value, func, attrs*) def initForm(formId: String): JsCmd = Noop def destroyForm(formId: String): JsCmd = { OnLoad( @@ -260,7 +260,7 @@ case object NodeStateComparator extends NodeCriterionType { nodeStates, Box(nodeStates.find(_._1 == value).map(_._1)), func, - attrs: _* + attrs* ) } } @@ -284,7 +284,7 @@ case object NodeOstypeComparator extends NodeCriterionType { (osTypes map (e => (e, e))).toSeq, if (osTypes.contains(value)) Full(value) else Empty, func, - attrs: _* + attrs* ) } } @@ -328,7 +328,7 @@ case object NodeOsNameComparator extends NodeCriterionType { osNames.map(e => (e.name, distribName(e))).toSeq, osNames.find(x => x.name == value).map(_.name), func, - attrs: _* + attrs* ) } } @@ -440,7 +440,7 @@ final case class NodePropertyComparator(ldapAttr: String) extends NodeCriterionT } override def matches(comparator: CriterionComparator, value: String): NodeInfoMatcher = { - import com.normation.rudder.domain.queries.{KeyValueComparator => KVC} + import com.normation.rudder.domain.queries.KeyValueComparator as KVC comparator match { // equals mean: the key is equals to kv._1 and the value is defined and the value is equals to kv._2.get @@ -707,7 +707,7 @@ case object MachineComparator extends LDAPCriterionType { (machineTypes map (e => (e, e))).toSeq, if (machineTypes.contains(value)) Full(value) else Empty, func, - attrs: _* + attrs* ) } } @@ -748,7 +748,7 @@ final case object VmTypeComparator extends LDAPCriterionType { (vmTypes map (e => (e._1, e._2))), Box(vmTypes.find(_._1 == value).map(_._1)), func, - attrs: _* + attrs* ) } } @@ -804,9 +804,9 @@ case object AgentComparator extends LDAPCriterionType { comparator match { // for equals and not equals, check value for joker case Equals => - OR(filters: _*) + OR(filters*) case _ => // actually, this is meant to be "not equals" - NOT(OR(filters: _*)) + NOT(OR(filters*)) } } @@ -815,7 +815,7 @@ case object AgentComparator extends LDAPCriterionType { agentTypes, Box(agentTypes.find(_._1 == value)).map(_._1), func, - attrs: _* + attrs* ) } } @@ -830,7 +830,7 @@ case object EditorComparator extends LDAPCriterionType { (editors map (e => (e, e))).toSeq, if (editors.contains(value)) Full(value) else Empty, func, - attrs: _* + attrs* ) } override def toLDAP(value: String): PureResult[String] = Right(value) @@ -989,7 +989,7 @@ final case class SubGroupComparator(subGroupComparatorRepo: () => SubGroupCompar subGroups, Box(subGroups.find(_.value == value).map(_.value)), func, - attrs: _* + attrs* ) } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/DitQueryData.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/DitQueryData.scala index c1a8c068425..8b88d146da7 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/DitQueryData.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/DitQueryData.scala @@ -37,10 +37,10 @@ package com.normation.rudder.domain.queries -import com.normation.inventory.ldap.core._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.inventory.ldap.core.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* import com.normation.rudder.domain.NodeDit import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.RudderLDAPConstants.OC_RUDDER_NODE_GROUP diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/GroupCategory.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/GroupCategory.scala index fef8cad13e5..86303808d31 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/GroupCategory.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/GroupCategory.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.queries -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* final case class GroupCategoryUuid(val value: String) extends AnyVal with Uuid // val attrName = A_GROUP_CATEGORY_UUID diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/JsonSelect.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/JsonSelect.scala index 23f701cc7e9..b9871fae8e7 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/JsonSelect.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/JsonSelect.scala @@ -142,7 +142,7 @@ object JsonSelect { // lead to a mess of quoted strings // - just parsing as JSONAware fails on string, int, etc. - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* for { jsonValue <- try { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala index f01c48cacda..c0e0f27407e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala @@ -37,10 +37,10 @@ package com.normation.rudder.domain.queries -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.inventory.domain.NodeId -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.inventory.ldap.core.LDAPConstants.A_PROCESS import com.normation.rudder.domain.RudderLDAPConstants.A_NODE_GROUP_UUID import com.normation.rudder.domain.RudderLDAPConstants.A_NODE_PROPERTY @@ -48,8 +48,8 @@ import com.normation.rudder.domain.RudderLDAPConstants.A_STATE import com.normation.rudder.domain.logger.FactQueryProcessorLoggerPure import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.properties.NodeProperty -import com.normation.rudder.domain.queries.{KeyValueComparator => KVC} import com.normation.rudder.domain.queries.KeyValueComparator.HasKey +import com.normation.rudder.domain.queries.KeyValueComparator as KVC import com.normation.rudder.facts.nodes.CoreNodeFact import com.normation.rudder.facts.nodes.NodeFact import com.normation.rudder.repository.RoNodeGroupRepository @@ -60,8 +60,8 @@ import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat import scala.collection.SortedMap import scala.util.Try -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* trait SubGroupComparatorRepository { def getNodeIds(groupId: NodeGroupId): IOResult[Chunk[NodeId]] diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/QueryEntity.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/QueryEntity.scala index a61c3c9ce6e..ee0a7d01636 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/QueryEntity.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/QueryEntity.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.queries -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* final case class QueryUuid(val value: String) extends AnyVal with Uuid // val attrName = A_QUERY_UUID diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala index 8fc060f673c..52def270284 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/CleanReportsAction.scala @@ -1,10 +1,10 @@ package com.normation.rudder.domain.reports -import com.normation.rudder.batch._ +import com.normation.rudder.batch.* import com.normation.rudder.domain.logger.ReportLogger import com.normation.rudder.services.system.DatabaseManager import com.normation.rudder.services.system.DeleteCommand -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime /* diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala index 7a08e0e4bd5..05f2c186f5e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ComplianceLevel.scala @@ -40,7 +40,7 @@ package com.normation.rudder.domain.reports import com.normation.rudder.domain.reports.ComplianceLevel.PERCENT_PRECISION import com.normation.rudder.domain.reports.CompliancePrecision.Level0 import com.normation.rudder.domain.reports.CompliancePrecision.Level2 -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.js.JE import net.liftweb.http.js.JE.JsArray import net.liftweb.json.JsonAST.JInt @@ -135,7 +135,7 @@ object CompliancePercent { // a correspondance array between worse order in `ReportType` and the order of fields in `ComplianceLevel` val WORSE_ORDER: Array[Int] = { - import ReportType._ + import ReportType.* Array( Pending, EnforceSuccess, @@ -447,7 +447,7 @@ object ComplianceLevel { def PERCENT_PRECISION = Level2 def compute(reports: Iterable[ReportType]): ComplianceLevel = { - import ReportType._ + import ReportType.* if (reports.isEmpty) { ComplianceLevel(notApplicable = 1) } else { @@ -559,7 +559,7 @@ object ComplianceLevel { } object ComplianceLevelSerialisation { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* // utility class to alway have the same names in JSON, // even if we are refactoring ComplianceLevel at some point @@ -667,7 +667,7 @@ object ComplianceLevelSerialisation { } def toJson: JObject = { - import compliance._ + import compliance.* toJObject( pending, success, @@ -694,7 +694,7 @@ object ComplianceLevelSerialisation { // new fields. implicit class CompliancePercentToJs(val c: CompliancePercent) extends AnyVal { def toJson: JObject = { - import c._ + import c.* toJObject( pending, success, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala index 424231cdb1a..700003fdc4d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/ExpectedReports.scala @@ -39,7 +39,7 @@ package com.normation.rudder.domain.reports import com.normation.cfclerk.domain.ReportingLogic import com.normation.cfclerk.domain.TechniqueVersion -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.Constants import com.normation.rudder.domain.policies.DirectiveId @@ -60,7 +60,7 @@ import net.liftweb.common.Failure import net.liftweb.common.Full import org.joda.time.DateTime import org.joda.time.Duration -import zio.json._ +import zio.json.* import zio.json.internal.Write final case class NodeModeConfig( @@ -588,7 +588,7 @@ object ExpectedReportsSerialisation { */ value match { case ".modes(missing)" => - import Version7_1._ + import Version7_1.* s.fromJson[JsonNodeExpectedReports7_1] match { case Left(value) => Failure(value) case Right(value) => Full(value.transform) // should not happen @@ -606,14 +606,14 @@ object ExpectedReportsSerialisation { * We always serialise to 7.1 format */ implicit class JNodeToJson(val n: JsonNodeExpectedReports) extends AnyVal { - import Version7_1._ + import Version7_1.* private def toJson7_1 = n.transform def toJson = toJson7_1.toJsonPretty def toCompactJson = toJson7_1.toJson } implicit class NodeToJson(val n: NodeExpectedReports) extends AnyVal { - import Version7_1._ + import Version7_1.* private def toJson7_1 = { JsonNodeExpectedReports(n.modes, n.ruleExpectedReports, n.overrides).transform } @@ -624,7 +624,7 @@ object ExpectedReportsSerialisation { object NodeConfigIdSerializer { - import net.liftweb.json._ + import net.liftweb.json.* import org.joda.time.format.ISODateTimeFormat // date are ISO format @@ -639,7 +639,7 @@ object NodeConfigIdSerializer { */ def serialize(ids: Vector[NodeConfigIdInfo]): String = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* // be careful, we can have several time the same id with different creation date // we want an array of { begin : id } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/StatusReports.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/StatusReports.scala index 634362e904d..790a98062a2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/StatusReports.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/reports/StatusReports.scala @@ -38,12 +38,12 @@ package com.normation.rudder.domain.reports import com.normation.cfclerk.domain.ReportingLogic -import com.normation.cfclerk.domain.ReportingLogic._ +import com.normation.cfclerk.domain.ReportingLogic.* import com.normation.cfclerk.domain.WorstReportReportingLogic import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.services.reports._ +import com.normation.rudder.services.reports.* import net.liftweb.common.Loggable import org.joda.time.DateTime @@ -335,7 +335,7 @@ final case class BlockStatusReport( subComponents.collect { case g: BlockStatusReport => g }.flatMap(_.findChildren(componentName)) } def compliance: ComplianceLevel = { - import ReportingLogic._ + import ReportingLogic.* reportingLogic match { // simple weighted compliance, as usual case WeightedReport => ComplianceLevel.sum(subComponents.map(_.compliance)) @@ -426,7 +426,7 @@ object ComponentStatusReport extends Loggable { val groupComponent = reports.collect { case c: BlockStatusReport => c }.toList match { case Nil => Nil case r => - import ReportingLogic._ + import ReportingLogic.* val reportingLogic = r .map(_.reportingLogic) .reduce((a, b) => { @@ -511,8 +511,8 @@ object MessageStatusReport { object NodeStatusReportSerialization { - import net.liftweb.json._ - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.* + import net.liftweb.json.JsonDSL.* def jsonRunInfo(runInfo: RunAndConfigInfo): JValue = { @@ -593,7 +593,7 @@ object NodeStatusReportSerialization { } implicit class SetRuleNodeStatusReportToJs(reports: Set[RuleNodeStatusReport]) { - import ComplianceLevelSerialisation._ + import ComplianceLevelSerialisation.* def componentValueToJson(c: ComponentStatusReport): JValue = { c match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/servers/Srv.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/servers/Srv.scala index a1009ea0b70..fa3cfa8cfdc 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/servers/Srv.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/servers/Srv.scala @@ -39,7 +39,7 @@ package com.normation.rudder.domain.servers import com.normation.inventory.domain.InventoryStatus import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import org.joda.time.DateTime /** @@ -58,7 +58,7 @@ final case class Srv( ) object Srv { - import com.normation.inventory.ldap.core.LDAPConstants._ + import com.normation.inventory.ldap.core.LDAPConstants.* /** * List of attributes needed to be able to map a Srv. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/workflows/ChangeRequest.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/workflows/ChangeRequest.scala index a142c1009bb..0061ee180bd 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/workflows/ChangeRequest.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/workflows/ChangeRequest.scala @@ -41,8 +41,8 @@ import com.normation.cfclerk.domain.SectionSpec import com.normation.cfclerk.domain.TechniqueName import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.ChangeRequestGlobalParameterDiff import com.normation.rudder.domain.properties.GlobalParameter import net.liftweb.common.Box @@ -142,10 +142,10 @@ final case class ConfigurationChangeRequest( // To get the owner of the change request we need to get the actor of oldest change associated to change request // We have to regroup all changes in one sequence then find the oldest change in them - val changes: Seq[Changes[_, _, _ <: ChangeItem[_]]] = + val changes: Seq[Changes[?, ?, ? <: ChangeItem[?]]] = (directives.values ++ rules.values ++ nodeGroups.values ++ globalParams.values).toSeq - val change: Seq[Change[_, _, _ <: ChangeItem[_]]] = changes.map(_.changes) - val firsts: Seq[ChangeItem[_]] = change.map(_.firstChange) + val change: Seq[Change[?, ?, ? <: ChangeItem[?]]] = changes.map(_.changes) + val firsts: Seq[ChangeItem[?]] = change.map(_.firstChange) firsts.sortWith((a, b) => a.creationDate isAfter b.creationDate).headOption.map(_.actor.name).getOrElse("No One") } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala index 78913bb9ee3..e21d46c913c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala @@ -37,14 +37,14 @@ package com.normation.rudder.facts.nodes -import com.normation.box._ +import com.normation.box.* import com.normation.errors.Inconsistency import com.normation.errors.PureResult import com.normation.errors.RudderError import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.inventory.domain._ -import com.normation.inventory.domain.{Version => SVersion} +import com.normation.inventory.domain.* +import com.normation.inventory.domain.Version as SVersion import com.normation.rudder.apidata.NodeDetailLevel import com.normation.rudder.domain.eventlog import com.normation.rudder.domain.logger.PolicyGenerationLogger @@ -60,12 +60,12 @@ import com.normation.rudder.domain.properties.InheritMode import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.domain.properties.PropertyProvider import com.normation.rudder.domain.servers.Srv -import com.normation.rudder.reports._ +import com.normation.rudder.reports.* import com.normation.rudder.tenants.TenantId import com.normation.utils.ParseVersion import com.normation.utils.Version -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import com.typesafe.config.ConfigRenderOptions import com.typesafe.config.ConfigValue import java.net.InetAddress @@ -73,13 +73,13 @@ import net.liftweb.common.Box import net.liftweb.common.EmptyBox import net.liftweb.common.Full import net.liftweb.json.JsonAST -import net.liftweb.json.JsonAST._ +import net.liftweb.json.JsonAST.* import net.liftweb.json.JsonAST.JValue import org.joda.time.DateTime -import zio._ -import zio.json._ +import zio.* +import zio.json.* import zio.json.ast.Json -import zio.json.ast.Json._ +import zio.json.ast.Json.* import zio.json.internal.Write /** @@ -197,7 +197,7 @@ object SoftwareFact { } def fromSoftware(s: Software): Option[SoftwareFact] = { - import NodeFact._ + import NodeFact.* s.toFact } } @@ -421,7 +421,7 @@ object NodeFact { def toChunk: Chunk[A] = Chunk.fromIterable(it) } - implicit class EitherToChunk[A](either: Either[_, A]) { + implicit class EitherToChunk[A](either: Either[?, A]) { def toChunk: Chunk[A] = { either match { case Left(_) => Chunk.empty @@ -820,7 +820,7 @@ object NodeFact { } def updateNode(node: NodeFact, n: Node): NodeFact = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* node .modify(_.description) .setTo(Some(n.description)) @@ -1020,7 +1020,7 @@ final case class CoreNodeFact( object CoreNodeFact { def updateNode(node: CoreNodeFact, n: Node): CoreNodeFact = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* node .modify(_.description) .setTo(Some(n.description)) @@ -1761,8 +1761,8 @@ object NodeFactSerialisation { // scalac: Error while emitting com/normation/rudder/facts/nodes/NodeFactSerialisation$ // Method too large: com/normation/rudder/facts/nodes/NodeFactSerialisation$. ()V - import com.normation.inventory.domain.JsonSerializers.implicits.{decoderDateTime => _, encoderDateTime => _, _} - import com.normation.utils.DateFormaterService.json._ + import com.normation.inventory.domain.JsonSerializers.implicits.{decoderDateTime as _, encoderDateTime as _, *} + import com.normation.utils.DateFormaterService.json.* object SimpleCodec { @@ -1943,7 +1943,7 @@ object NodeFactSerialisation { JsonCodec.string.transform[SoftwareEditor](SoftwareEditor(_), _.name) } - import SimpleCodec._ + import SimpleCodec.* implicit val codecBios: JsonCodec[Bios] = DeriveJsonCodec.gen diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactChangeEventCallback.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactChangeEventCallback.scala index 762d5771f50..5365046810d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactChangeEventCallback.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactChangeEventCallback.scala @@ -158,7 +158,7 @@ class CacheInvalidateNodeFactEventCallback( cacheToClear: List[CachedRepository] ) extends NodeFactChangeEventCallback { - import com.normation.rudder.services.reports.CacheExpectedReportAction._ + import com.normation.rudder.services.reports.CacheExpectedReportAction.* override def name: String = "node-fact-cec: invalidate caches" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala index db8b55e775e..a3295a9fe20 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala @@ -37,20 +37,20 @@ package com.normation.rudder.facts.nodes -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.services.core.ReadOnlySoftwareDAO import com.normation.rudder.domain.Constants import com.normation.rudder.domain.logger.NodeLoggerPure import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.tenants.TenantService -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import scala.collection.MapView -import zio._ +import zio.* import zio.concurrent.ReentrantLock import zio.stream.ZStream -import zio.syntax._ +import zio.syntax.* /* * NodeFactRepository is the main interface between Rudder user space and nodes. It manages @@ -346,7 +346,7 @@ class CoreNodeFactRepository( lock: ReentrantLock, cbTimeout: zio.Duration = 5.seconds ) extends NodeFactRepository { - import NodeFactChangeEvent._ + import NodeFactChangeEvent.* // debug log // (for { @@ -554,8 +554,8 @@ class CoreNodeFactRepository( private[nodes] def checkRootProperties(node: NodeFact): IOResult[Unit] = { // use cats validation - import cats.data._ - import cats.implicits._ + import cats.data.* + import cats.implicits.* type ValidationResult = ValidatedNel[String, Unit] val ok = ().validNel diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactServiceProxies.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactServiceProxies.scala index f6275655899..06df16b4226 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactServiceProxies.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactServiceProxies.scala @@ -62,10 +62,10 @@ import com.normation.rudder.domain.nodes.NodeInfo import com.normation.rudder.domain.nodes.NodeKind import com.normation.rudder.repository.WoNodeRepository import com.normation.rudder.services.nodes.NodeInfoService -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * This service is only used in InventoryProcessor. It is not so much a proxy than an actual implementation, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala index f6261505daa..87fc0967946 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactStorage.scala @@ -37,18 +37,18 @@ package com.normation.rudder.facts.nodes -import NodeFactSerialisation._ +import NodeFactSerialisation.* import better.files.File -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.ldap.core.FullInventoryRepositoryImpl import com.normation.inventory.ldap.core.InventoryDitService import com.normation.inventory.ldap.core.InventoryMapper -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.inventory.services.core.ReadOnlySoftwareDAO import com.normation.inventory.services.provisioning.SoftwareDNFinderAction -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.ldap.sdk.BuildFilter.* import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.LDAPEntry import com.normation.ldap.sdk.One @@ -65,17 +65,17 @@ import com.normation.rudder.repository.ldap.LDAPEntityMapper import com.normation.rudder.repository.ldap.ScalaReadWriteLock import com.normation.rudder.services.nodes.NodeInfoService import com.normation.utils.StringUuidGenerator -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import com.unboundid.ldap.sdk.DN import java.nio.charset.StandardCharsets import org.eclipse.jgit.lib.PersonIdent import org.joda.time.DateTime import scala.annotation.nowarn -import zio._ -import zio.json._ +import zio.* +import zio.json.* import zio.stream.ZStream -import zio.syntax._ +import zio.syntax.* /* * This file contains the base to persist facts into a git repository. There is a lot of question @@ -181,8 +181,8 @@ object StorageChangeEventSave { s: InventoryStatus, cc: ChangeContext ): NodeFactChangeEventCC = { - import NodeFactChangeEvent.{Noop => NoopCE} - import NodeFactChangeEvent.{Updated => UpdatedCE, _} + import NodeFactChangeEvent.Noop as NoopCE + import NodeFactChangeEvent.{Updated as UpdatedCE, *} s match { case RemovedInventory => // this case is ignored, we don't delete node based on status value NodeFactChangeEventCC(NoopCE(nodeId, SelectFacts.all), cc) @@ -247,7 +247,7 @@ object StorageChangeEventDelete { s: InventoryStatus, cc: ChangeContext ): NodeFactChangeEventCC = { - import NodeFactChangeEvent.{Noop => NoopCE, Deleted => DeletedCE, _} + import NodeFactChangeEvent.{Noop as NoopCE, Deleted as DeletedCE, *} def patternMatch( event: StorageChangeEventDelete, @@ -395,7 +395,7 @@ class GitNodeFactStorageImpl( * As we want it to be human readable and searchable, we will use an indented format. */ def toJson(nodeFact: NodeFact): IOResult[String] = { - import GitNodeFactStorageImpl._ + import GitNodeFactStorageImpl.* val node = nodeFact .modify(_.accounts) .using(_.sorted) @@ -636,7 +636,7 @@ object LdapNodeFactStorage { selectFacts.software.mode == SelectMode.Retrieve } - def inventoryFacts(s: SelectFacts): List[SelectFactConfig[_ <: Equals with IterableOnce[Serializable] with Serializable]] = { + def inventoryFacts(s: SelectFacts): List[SelectFactConfig[? <: Equals with IterableOnce[Serializable] with Serializable]] = { List( s.swap, s.accounts, @@ -798,7 +798,7 @@ class LdapNodeFactStorage( private[nodes] def getNodeFact(nodeId: NodeId, status: InventoryStatus, attrs: SelectFacts): IOResult[Option[NodeFact]] = { def getNodeEntry(con: RwLDAPConnection, id: NodeId): IOResult[Option[LDAPEntry]] = { - con.get(nodeDit.NODES.NODE.dn(nodeId.value), NodeInfoService.nodeInfoAttributes: _*) + con.get(nodeDit.NODES.NODE.dn(nodeId.value), NodeInfoService.nodeInfoAttributes*) } def getSoftware( con: RwLDAPConnection, @@ -853,14 +853,14 @@ class LdapNodeFactStorage( // mostly copied from com.normation.rudder.services.nodes.NodeInfoServiceCachedImpl # getBackendLdapNodeInfo val ldapAttrs = (if (needSoftware) Seq(A_SOFTWARE_DN) else Seq()) ++ NodeInfoService.nodeInfoAttributes - con.get(inventoryDitService.getDit(status).NODES.NODE.dn(nodeId.value), ldapAttrs: _*).flatMap { + con.get(inventoryDitService.getDit(status).NODES.NODE.dn(nodeId.value), ldapAttrs*).flatMap { case None => // end of game, no node here None.succeed case Some(inv) => for { optM <- inv(A_CONTAINER_DN) match { case None => None.succeed - case Some(m) => con.get(new DN(m), ldapAttrs: _*) + case Some(m) => con.get(new DN(m), ldapAttrs*) } info <- nodeMapper.convertEntriesToNodeInfos(nodeEntry, inv, optM) soft <- getSoftware(con, fullInventoryRepository.getSoftwareUuids(inv), needSoftware) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitFindUtils.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitFindUtils.scala index 99c17dee41c..3aa2b89e8a4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitFindUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitFindUtils.scala @@ -42,14 +42,14 @@ import com.normation.GitVersion.Revision import com.normation.GitVersion.RevisionInfo import com.normation.NamedZioLogger import com.normation.box.IOManaged -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.git.ZipUtils.Zippable import java.io.ByteArrayOutputStream import java.io.File import java.io.InputStream import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Status -import org.eclipse.jgit.lib.{Constants => JConstants} +import org.eclipse.jgit.lib.Constants as JConstants import org.eclipse.jgit.lib.ObjectId import org.eclipse.jgit.lib.ObjectStream import org.eclipse.jgit.lib.Repository @@ -58,8 +58,8 @@ import org.eclipse.jgit.treewalk.TreeWalk import org.eclipse.jgit.treewalk.filter.PathFilter import org.eclipse.jgit.treewalk.filter.TreeFilter import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * Utility trait to find/list/get content @@ -145,7 +145,7 @@ object GitFindUtils extends NamedZioLogger { * Retrieve revisions for the given path */ def findRevFromPath(git: Git, path: String): IOResult[Iterable[RevisionInfo]] = { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* IOResult.attemptZIO(s"Error when looking for revisions changes in '${path}'") { ZIO.foreach(git.log().addPath(path).call().asScala) { commit => RevisionInfo( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitItemRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitItemRepository.scala index 85906332676..3ab899fd9af 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitItemRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitItemRepository.scala @@ -38,20 +38,20 @@ package com.normation.rudder.git import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.ModificationId import com.normation.rudder.domain.logger.GitArchiveLogger import com.normation.rudder.domain.logger.GitArchiveLoggerPure -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.repository.xml.ArchiveMode import com.normation.utils.DateFormaterService import java.io.File import org.eclipse.jgit.lib.PersonIdent import org.eclipse.jgit.revwalk.RevTag import org.joda.time.DateTime -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import scala.util.control.NonFatal -import zio._ +import zio.* /** * Utility trait that factor out file commits. @@ -383,8 +383,8 @@ trait GitArchiverFullCommitUtils extends NamedZioLogger { */ private[this] def listTagWorkaround: IOResult[Seq[RevTag]] = { import org.eclipse.jgit.errors.IncorrectObjectTypeException - import org.eclipse.jgit.lib._ - import org.eclipse.jgit.revwalk._ + import org.eclipse.jgit.lib.* + import org.eclipse.jgit.revwalk.* import scala.collection.mutable.ArrayBuffer diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRepositoryProvider.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRepositoryProvider.scala index 3854c85e82a..423b5d10537 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRepositoryProvider.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRepositoryProvider.scala @@ -37,16 +37,16 @@ package com.normation.rudder.git -import better.files._ -import com.normation.errors._ +import better.files.* +import com.normation.errors.* import com.normation.rudder.domain.logger.GitRepositoryLogger -import com.normation.zio._ +import com.normation.zio.* import org.eclipse.jgit.api.Git import org.eclipse.jgit.internal.storage.file.FileRepository import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.storage.file.FileRepositoryBuilder -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * A service that gives access to the Git diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala index c98a0143f33..308023e45c2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/GitRevisionProvider.scala @@ -37,12 +37,12 @@ package com.normation.rudder.git -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.domain.logger.GitRepositoryLogger -import com.normation.zio._ +import com.normation.zio.* import org.eclipse.jgit.lib.ObjectId import org.eclipse.jgit.revwalk.RevWalk -import zio._ +import zio.* /** * A service that allows to know what is the diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/ZipUtils.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/ZipUtils.scala index 5cb375ed077..3050ec24f6a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/ZipUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/git/ZipUtils.scala @@ -52,10 +52,10 @@ import java.util.zip.ZipOutputStream import org.apache.commons.io.FileUtils import org.apache.commons.io.IOUtils import scala.collection.Seq -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import zio.Chunk import zio.ZIO -import zio.syntax._ +import zio.syntax.* object ZipUtils { @@ -93,7 +93,7 @@ object ZipUtils { // unzip an input stream into zip entries def getZipEntries(name: String, zip: InputStream): IOResult[Chunk[(ZipEntry, Option[Array[Byte]])]] = { - import better.files._ + import better.files.* // ah, Java. It was a long time ago. I didn't miss you. // effect-full and all horror, must be encapsulated. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunHooks.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunHooks.scala index 060f6bfefd2..ed6cd408bc4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunHooks.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunHooks.scala @@ -38,9 +38,9 @@ package com.normation.rudder.hooks import com.normation.NamedZioLogger -import com.normation.box._ -import com.normation.errors._ -import com.normation.zio._ +import com.normation.box.* +import com.normation.errors.* +import com.normation.zio.* import java.io.File import java.nio.charset.StandardCharsets import net.liftweb.common.Box @@ -50,8 +50,8 @@ import net.liftweb.common.Logger import org.slf4j import org.slf4j.LoggerFactory import scala.util.control.NonFatal -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * The goal of that file is to give a simple abstraction to run hooks in @@ -99,7 +99,7 @@ object HookEnvPairs { def toListPairs(values: (String, String)*): List[HookEnvPair] = values.map(p => HookEnvPair(p._1, p._2)).toList def build(values: (String, String)*): HookEnvPairs = { - HookEnvPairs(toListPairs(values: _*)) + HookEnvPairs(toListPairs(values*)) } } @@ -202,7 +202,7 @@ object RunHooks { unitKillAfter: Duration = 5.minutes ): IOResult[(HookReturnCode, Long)] = { - import HookReturnCode._ + import HookReturnCode.* def logReturnCode(result: HookReturnCode): IOResult[Unit] = { for { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala index 6338ff66cb4..d07ca474c11 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/hooks/RunNuCommand.scala @@ -38,8 +38,8 @@ package com.normation.rudder.hooks import com.normation.NamedZioLogger -import com.normation.errors._ -import com.normation.zio._ +import com.normation.errors.* +import com.normation.zio.* import com.zaxxer.nuprocess.NuProcess import com.zaxxer.nuprocess.NuProcessBuilder import com.zaxxer.nuprocess.codec.NuAbstractCharsetHandler @@ -49,9 +49,9 @@ import java.nio.charset.CoderResult import java.nio.charset.StandardCharsets import java.nio.file.Path import java.util -import zio._ +import zio.* import zio.Duration.Infinity -import zio.syntax._ +import zio.syntax.* /* * The goal of that file is to give a simple abstraction to run hooks in @@ -87,7 +87,7 @@ object RunNuCommand { // we don't want NuCommand to log with its format which is totally broken along our, so we redefined it. // we don't really use that class but need that trick to be able to access protected fields. object SilentLogger extends BasePosixProcess(null) { - import java.util.logging._ + import java.util.logging.* override def start(command: util.List[String], environment: Array[String], cwd: Path): NuProcess = null override def run(command: util.List[String], environment: Array[String], cwd: Path): Unit = {} def silent(): Unit = { @@ -168,7 +168,7 @@ object RunNuCommand { * * */ - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* val errorMsg = s"Error when executing command ${cmd.display}" (for { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryDigestServiceV1.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryDigestServiceV1.scala index 9dea74fa351..8851cdfb303 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryDigestServiceV1.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryDigestServiceV1.scala @@ -36,11 +36,11 @@ package com.normation.inventory.services.provisioning -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.rudder.facts.nodes.CoreNodeFact -import zio.syntax._ +import zio.syntax.* class InventoryDigestServiceV1( getExistingNode: NodeId => IOResult[Option[CoreNodeFact]] diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala index 03d31d5fcf2..f84a5c8be54 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryFileWatcher.scala @@ -37,11 +37,11 @@ package com.normation.rudder.inventory -import better.files._ +import better.files.* import com.normation.box.IOManaged -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.InventoryProcessingLogger -import com.normation.zio._ +import com.normation.zio.* import com.normation.zio.ZioRuntime import java.io.FileNotFoundException import java.io.InputStream @@ -54,8 +54,8 @@ import org.apache.commons.io.filefilter.TrueFileFilter import org.joda.time.DateTime import scala.annotation.nowarn import scala.concurrent.ExecutionContext -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * This file manage incoming inventories, but not their processing. @@ -268,7 +268,7 @@ object Watchers { } } - override def onUnknownEvent(event: file.WatchEvent[_]): Unit = { + override def onUnknownEvent(event: file.WatchEvent[?]): Unit = { event.kind() match { case StandardWatchEventKinds.OVERFLOW => tempoOverflow.offer(()).runNow @@ -395,7 +395,7 @@ class CheckExistingInventoryFilesImpl( // - then, we delete all inventories files older than our threshold // - and the one that are not in pair (if older than waitingSignatureTime def filterFiles(maxAgeGlobal: DateTime, maxAgeOrphan: DateTime, files: List[File]): FilteredFiles = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* val (filtered, pairs) = files.foldLeft((FilteredFiles(Nil, Nil, Nil), Map[String, List[File]]())) { case ((filteredFiles, pairs), file) => if (hasValidExtension(file)) { @@ -458,7 +458,7 @@ class CheckExistingInventoryFilesImpl( * See: https://issues.rudder.io/issues/19268 */ def listFiles(d: Duration): UIO[List[File]] = { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* (for { // if that fails, just exit ageLimit <- IOResult.attempt(DateTime.now().minusMillis(d.toMillis.toInt)) @@ -712,7 +712,7 @@ class ProcessFile( * touched, or inotify event emission not what we thought) */ val saveInventoryBufferProcessing: ZIO[Any, Nothing, Unit] = { - import com.normation.rudder.inventory.StatusLog._ + import com.normation.rudder.inventory.StatusLog.* for { fst <- saveInventoryBuffer.take // deduplicate and prioritize file in 'incoming', which are new inventories. TakeAll is not blocking diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala index 85dca58488d..cc2c9f3d60e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala @@ -39,7 +39,7 @@ package com.normation.rudder.inventory import better.files.File import com.normation.box.IOManaged -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.Chained import com.normation.errors.IOResult import com.normation.inventory.domain.CertifiedKey @@ -55,17 +55,17 @@ import com.normation.rudder.hooks.HookEnvPairs import com.normation.rudder.hooks.PureHooksLogger import com.normation.rudder.hooks.RunHooks import com.normation.utils.DateFormaterService -import com.normation.zio._ +import com.normation.zio.* import com.normation.zio.ZioRuntime import java.io.InputStream import java.nio.file.NoSuchFileException -import java.security.{PublicKey => JavaSecPubKey} +import java.security.PublicKey as JavaSecPubKey import org.joda.time.DateTime import org.joda.time.Duration import org.joda.time.format.PeriodFormat import scala.annotation.nowarn -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * The interface between whatever event and the actual saving process. @@ -154,7 +154,7 @@ object StatusLog { class InventoryProcessor( unmarshaller: InventoryParser, - inventorySaver: InventorySaver[_], + inventorySaver: InventorySaver[?], val maxParallel: Long, digestService: InventoryDigestServiceV1, checkAliveLdap: () => IOResult[Unit] @@ -324,11 +324,11 @@ class InventoryFailedHook( HOOKS_D: String, HOOKS_IGNORE_SUFFIXES: List[String] ) { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* def runHooks(file: File): UIO[Unit] = { (for { - systemEnv <- IOResult.attempt(java.lang.System.getenv.asScala.toSeq).map(seq => HookEnvPairs.build(seq: _*)) + systemEnv <- IOResult.attempt(java.lang.System.getenv.asScala.toSeq).map(seq => HookEnvPairs.build(seq*)) hooks <- RunHooks.getHooksPure(HOOKS_D + "/node-inventory-received-failed", HOOKS_IGNORE_SUFFIXES) _ <- for { timeHooks0 <- currentTimeMillis @@ -393,7 +393,7 @@ class InventoryMover( * - nodeXXX-uuid.ocs.sign */ def writeErrorLogFile(failedInventoryPath: File, result: InventoryProcessStatus): UIO[Unit] = { - import com.normation.rudder.inventory.StatusLog._ + import com.normation.rudder.inventory.StatusLog.* val date = DateFormaterService.serialize(DateTime.now()) val rejectPath = failedInventoryPath.pathAsString + s".reject-${date}.log" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/PostCommits.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/PostCommits.scala index 804f40cfe44..24113b7c42e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/PostCommits.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/PostCommits.scala @@ -37,11 +37,11 @@ package com.normation.rudder.inventory -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.ModificationId -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.domain.Inventory -import com.normation.inventory.services.provisioning._ +import com.normation.inventory.services.provisioning.* import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.domain.eventlog.RudderEventActor @@ -56,8 +56,8 @@ import com.normation.rudder.score.ScoreServiceManager import com.normation.rudder.score.SystemUpdateScoreEvent import com.normation.utils.StringUuidGenerator import com.normation.zio.currentTimeMillis -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * This file contains post commit action to @@ -72,14 +72,14 @@ class PostCommitInventoryHooks[A]( HOOKS_D: String, HOOKS_IGNORE_SUFFIXES: List[String] ) extends PostCommit[A] { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* override val name = "post_commit_inventory:run_node-inventory-received_hooks" override def apply(inventory: Inventory, records: A): IOResult[A] = { val node = inventory.node.main val hooks = (for { - systemEnv <- IOResult.attempt(java.lang.System.getenv.asScala.toSeq).map(seq => HookEnvPairs.build(seq: _*)) + systemEnv <- IOResult.attempt(java.lang.System.getenv.asScala.toSeq).map(seq => HookEnvPairs.build(seq*)) hooks <- if (node.status == PendingInventory) { RunHooks.getHooksPure(HOOKS_D + "/node-inventory-received-pending", HOOKS_IGNORE_SUFFIXES) } else if (node.status == AcceptedInventory) { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/HistorizeNodeCountService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/HistorizeNodeCountService.scala index 547770a8473..8d7d9046ad6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/HistorizeNodeCountService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/HistorizeNodeCountService.scala @@ -37,8 +37,8 @@ package com.normation.rudder.metrics -import better.files._ -import com.normation.errors._ +import better.files.* +import com.normation.errors.* import com.normation.rudder.domain.logger.ScheduledJobLoggerPure import com.normation.rudder.domain.reports.ComplianceLevel import com.normation.rudder.facts.nodes.NodeFactRepository @@ -47,7 +47,7 @@ import com.normation.rudder.facts.nodes.SelectNodeStatus import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.git.GitRepositoryProviderImpl import com.normation.rudder.services.reports.ReportingService -import com.normation.zio._ +import com.normation.zio.* import java.nio.charset.StandardCharsets import java.util.concurrent.TimeUnit import org.apache.commons.csv.CSVFormat @@ -58,7 +58,7 @@ import org.joda.time.DateTimeZone import org.joda.time.format.DateTimeFormat import org.joda.time.format.DateTimeFormatter import org.joda.time.format.ISODateTimeFormat -import zio._ +import zio.* /* * First part describe API of main services, then there is default implementation @@ -227,7 +227,7 @@ class WriteNodeCSV( * Format data in one line of CSV according to parameters. */ def csv(date: DateTime, metrics: FrequentNodeMetrics): String = { - csvFormat.format((date.toString(ISODateTimeFormat.dateTimeNoMillis()) :: metrics.asList): _*) + "\n" + csvFormat.format((date.toString(ISODateTimeFormat.dateTimeNoMillis()) :: metrics.asList)*) + "\n" } /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/Scheduler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/Scheduler.scala index 47bf559fabc..f6bf689b9eb 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/Scheduler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/metrics/Scheduler.scala @@ -37,10 +37,10 @@ package com.normation.rudder.metrics -import com.normation.errors._ +import com.normation.errors.* import java.util.concurrent.TimeUnit -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * Scheduler to write logs in file. We want to log a new status line when interesting diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlEntityMigration.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlEntityMigration.scala index 906d632c276..660afdf0d4d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlEntityMigration.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlEntityMigration.scala @@ -1,19 +1,19 @@ package com.normation.rudder.migration -import cats.implicits._ +import cats.implicits.* import com.normation.rudder.db.DB import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ +import com.normation.rudder.db.Doobie.* import com.normation.rudder.domain.logger.MigrationLogger -import com.normation.utils.Control._ -import doobie._ -import doobie.implicits._ -import net.liftweb.common._ +import com.normation.utils.Control.* +import doobie.* +import doobie.implicits.* +import net.liftweb.common.* import org.joda.time.DateTime import scala.xml.Elem import scala.xml.Node import scala.xml.NodeSeq -import zio.interop.catz._ +import zio.interop.catz.* /** * specify from/to version @@ -145,7 +145,7 @@ final case class MigrationChangeRequest( trait ControlXmlFileFormatMigration extends XmlFileFormatMigration { def migrationEventLogRepository: MigrationEventLogRepository - def batchMigrators: List[BatchElementMigration[_]] + def batchMigrators: List[BatchElementMigration[?]] def previousMigrationController: Option[ControlXmlFileFormatMigration] def migrate: Box[MigrationStatus] = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigrationEntities.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigrationEntities.scala index 5bbb0d89197..371f18fdf58 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigrationEntities.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigrationEntities.scala @@ -39,14 +39,14 @@ package com.normation.rudder.migration import com.normation.rudder.db.DB import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ -import doobie.implicits._ +import com.normation.rudder.db.Doobie.* +import doobie.implicits.* import org.joda.time.DateTime -import zio.interop.catz._ +import zio.interop.catz.* class MigrationEventLogRepository(val db: Doobie) { - import db._ + import db.* val table = "migrationeventlog" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigration_5_6.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigration_5_6.scala index ecf1a9ded41..9b0a24211c4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigration_5_6.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/migration/XmlFileFormatMigration_5_6.scala @@ -99,7 +99,7 @@ class ControlXmlFileFormatMigration_5_6( override val previousMigrationController: Option[ControlXmlFileFormatMigration], val batchSize: Int = 1000 ) extends ControlXmlFileFormatMigration with Migration_5_6_Definition { - override val batchMigrators: List[BatchElementMigration[_ <: MigrableEntity] with Migration_5_6_Definition] = ( + override val batchMigrators: List[BatchElementMigration[? <: MigrableEntity] with Migration_5_6_Definition] = ( new EventLogsMigration_5_6(doobie, batchSize) :: new ChangeRequestsMigration_5_6(doobie, batchSize) :: Nil diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/DeleteEditorTechnique.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/DeleteEditorTechnique.scala index 528c569b6aa..867aa295d70 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/DeleteEditorTechnique.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/DeleteEditorTechnique.scala @@ -45,7 +45,7 @@ import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.services.TechniqueRepository import com.normation.cfclerk.services.UpdateTechniqueLibrary -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId @@ -58,8 +58,8 @@ import com.normation.rudder.repository.WoDirectiveRepository import com.normation.rudder.repository.xml.TechniqueArchiver import com.normation.rudder.services.workflows.ChangeRequestService import com.normation.rudder.services.workflows.WorkflowLevelService -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * Deleting a technique is complicated and needs its own service that will check on directives/etc. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala index bf6e7587d07..95a82d3f919 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala @@ -374,7 +374,7 @@ object Constraint { object CheckConstraint { def check(constraint: List[Constraint.Constraint], value: String): CheckResult = { - import Constraint._ + import Constraint.* constraint.map(_.check(value)).foldRight(OK: CheckResult) { case (OK, OK) => OK diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala index 20ca76b2382..ed306421596 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala @@ -1,7 +1,7 @@ package com.normation.rudder.ncf -import better.files._ -import com.normation.errors._ +import better.files.* +import com.normation.errors.* import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.eventlog.ModificationId @@ -21,13 +21,13 @@ import com.normation.rudder.repository.xml.TechniqueFiles import com.normation.rudder.repository.xml.XmlArchiverUtils import com.normation.rudder.services.user.PersonIdentService import com.normation.utils.StringUuidGenerator -import com.normation.zio._ +import com.normation.zio.* import java.time.Instant import zio.Ref import zio.ZIO -import zio.ZIO._ -import zio.json._ -import zio.syntax._ +import zio.ZIO.* +import zio.json.* +import zio.syntax.* trait EditorTechniqueReader { def readTechniquesMetadataFile: IOResult[(List[EditorTechnique], Map[BundleName, GenericMethod], List[RudderError])] @@ -57,7 +57,7 @@ class EditorTechniqueReaderImpl( val methodsFile: File = ncfRootDir / "generic_methods.json" def getAllTechniqueFiles(currentPath: File): IOResult[List[File]] = { - import com.normation.errors._ + import com.normation.errors.* for { subdirs <- IOResult.attempt(s"error when getting subdirectories of ${currentPath.pathAsString}")( currentPath.children.partition(_.isDirectory)._1.toList @@ -190,7 +190,7 @@ final case class JsonGenericMethod( parameter_rename: Option[List[JsonGenericMethodParameterRename]] ) { def toGenericMethod(id: BundleName, parameterTypeService: ParameterTypeService): PureResult[GenericMethod] = { - import cats.implicits._ + import cats.implicits.* parameter .traverse(_.toMethodParameter(parameterTypeService)) @@ -249,7 +249,7 @@ final case class JsonParameterConstraint( select: Option[List[JsonParameterConstraintSelect]] ) { def toConstraint: List[Constraint] = { - import Constraint._ + import Constraint.* AllowEmpty(allow_empty_string) :: AllowWhiteSpace(allow_whitespace_string) :: diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/ResourceFileService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/ResourceFileService.scala index 4969816a912..47bf820152a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/ResourceFileService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/ResourceFileService.scala @@ -80,8 +80,8 @@ class GitResourceFileService(gitReposProvider: GitRepositoryProvider) extends Re } } - import scala.jdk.CollectionConverters._ - import ResourceFileState._ + import scala.jdk.CollectionConverters.* + import ResourceFileState.* def toResource(resourcesPath: String)(fullPath: String, state: ResourceFileState): Option[ResourceFile] = { // workaround https://issues.rudder.io/issues/17977 - if the fullPath does not start by resourcePath, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala index 631e45206fe..a9daef85055 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueCompiler.scala @@ -38,9 +38,9 @@ package com.normation.rudder.ncf import better.files.File -import cats.implicits._ -import com.normation.box._ -import com.normation.errors._ +import cats.implicits.* +import com.normation.box.* +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.errors.RudderError import com.normation.inventory.domain.AgentType @@ -67,12 +67,12 @@ import java.nio.file.StandardCopyOption import net.liftweb.common.Box import net.liftweb.common.EmptyBox import net.liftweb.common.Full -import scala.xml.{Node => XmlNode} +import scala.xml.Node as XmlNode import scala.xml.NodeSeq -import zio._ -import zio.json._ -import zio.json.yaml._ -import zio.syntax._ +import zio.* +import zio.json.* +import zio.json.yaml.* +import zio.syntax.* /* * This file deals with the technique compilation by rudderc and the fallback logic (services and data types @@ -95,7 +95,7 @@ trait TechniqueCompiler { // compile based on absolute path of techniqueId/1.0 directory. If the technique is not yaml, it's an error. // If you have a json technique, you need to migrate it first. def compileAtPath(techniqueBaseDirectory: File): IOResult[TechniqueCompilationOutput] = { - import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer._ + import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer.* val yamlFile = techniqueBaseDirectory / TechniqueFiles.yaml for { yaml <- IOResult.attempt(s"Error when reading technique metadata '${yamlFile}'") { @@ -474,7 +474,7 @@ class TechniqueCompilerWithFallback( * read the compilation.yml file to see if user asked for webapp */ def readCompilationConfigFile(technique: EditorTechnique): IOResult[TechniqueCompilationConfig] = { - import TechniqueCompilationIO._ + import TechniqueCompilationIO.* for { content <- IOResult.attempt(s"Error when writing compilation file for technique '${getTechniqueRelativePath(technique)}'") { @@ -496,7 +496,7 @@ class TechniqueCompilerWithFallback( * If compilation had error, or if we fallbacked, we need to write the compilation file. */ def writeCompilationOutputFile(technique: EditorTechnique, comp: TechniqueCompilationOutput): IOResult[Unit] = { - import TechniqueCompilationIO._ + import TechniqueCompilationIO.* for { value <- comp.toYaml().toIO _ <- IOResult.attempt(getCompilationOutputFile(technique).write(value)) @@ -924,8 +924,8 @@ class ClassicTechniqueWriter( val methodCalls = bundleAndMethodCallsList.map(_._2).mkString("\n") val content = { - import net.liftweb.json._ - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.* + import net.liftweb.json.JsonDSL.* s"""# @name ${technique.name} |# @description ${technique.description.replaceAll("\\R", "\n# ")} diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala index eb1502d2f9d..c6ca828fd48 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala @@ -54,7 +54,7 @@ import net.liftweb.json.JValue class TechniqueSerializer(parameterTypeService: ParameterTypeService) { - import zio.json._ + import zio.json.* implicit val encoderParameterId: JsonEncoder[ParameterId] = JsonEncoder[String].contramap(_.value) implicit val encoderFieldParameterId: JsonFieldEncoder[ParameterId] = JsonFieldEncoder[String].contramap(_.value) @@ -100,7 +100,7 @@ class TechniqueSerializer(parameterTypeService: ParameterTypeService) { def serializeMethodMetadata(method: GenericMethod): JValue = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* def serializeMethodParameter(param: MethodParameter): JValue = { def serializeMethodConstraint(constraint: ncf.Constraint.Constraint): JField = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala index 49a9c4fe623..af81bfe97d5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala @@ -42,7 +42,7 @@ import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.services.UpdateTechniqueLibrary -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId @@ -53,8 +53,8 @@ import com.normation.rudder.repository.xml.TechniqueArchiver import com.normation.rudder.repository.xml.TechniqueFiles import com.normation.zio.currentTimeMillis import java.nio.charset.StandardCharsets -import zio._ -import zio.json.yaml._ +import zio.* +import zio.json.yaml.* /* * This service is in charge of writing an editor technique and it's related files. @@ -180,7 +180,7 @@ class TechniqueWriterImpl( // write the given EditorTechnique as YAML file in ${technique.path}/technique.yml def writeYaml(technique: EditorTechnique): IOResult[String] = { - import YamlTechniqueSerializer._ + import YamlTechniqueSerializer.* val metadataPath = s"${technique.path}/${TechniqueFiles.yaml}" val path = s"${baseConfigRepoPath}/${metadataPath}" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/migration/MigrateJsonTechniquesService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/migration/MigrateJsonTechniquesService.scala index 085f04cb821..c0194120845 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/migration/MigrateJsonTechniquesService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/migration/MigrateJsonTechniquesService.scala @@ -40,16 +40,16 @@ package com.normation.rudder.ncf.migration import better.files.File import com.normation.cfclerk.domain.ReportingLogic import com.normation.cfclerk.domain.ReportingLogic.WeightedReport -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.Version import com.normation.rudder.domain.logger.ApplicationLoggerPure -import com.normation.rudder.ncf._ +import com.normation.rudder.ncf.* import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer import com.normation.rudder.repository.xml.TechniqueFiles import java.nio.charset.StandardCharsets -import zio._ -import zio.json._ -import zio.json.yaml._ +import zio.* +import zio.json.* +import zio.json.yaml.* /** * An object able to migrate a (set of) old techniques with a @@ -164,7 +164,7 @@ object MigrateJsonTechniquesService { * Read a JSON string in old Rudder 7.3 metadata format as an Editor technique */ def fromOldJsonTechnique(json: String): PureResult[EditorTechnique] = { - import OldTechniqueSerializer._ + import OldTechniqueSerializer.* json .fromJson[EditorTechnique] .left @@ -175,7 +175,7 @@ object MigrateJsonTechniquesService { * transform a JSON string in old Rudder 7.3 format into a YAML string in 8.0 format */ def toYaml(json: String): PureResult[String] = { - import YamlTechniqueSerializer._ + import YamlTechniqueSerializer.* for { technique <- fromOldJsonTechnique(json).left.map(err => diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/yaml/YamlTechnique.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/yaml/YamlTechnique.scala index af60baeab29..c58221cc3b7 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/yaml/YamlTechnique.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/yaml/YamlTechnique.scala @@ -40,16 +40,16 @@ package com.normation.rudder.ncf.yaml import com.normation.cfclerk.domain.LoadTechniqueError.Consistancy import com.normation.cfclerk.domain.ReportingLogic import com.normation.cfclerk.domain.ReportingLogic.WeightedReport -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.AccumulateErrors import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.errors.PureResult import com.normation.inventory.domain.Version import com.normation.rudder.domain.policies.PolicyMode -import com.normation.rudder.ncf._ -import zio.json._ -import zio.json.yaml._ +import com.normation.rudder.ncf.* +import zio.json.* +import zio.json.yaml.* /* * Here we provide the datatype used to communicate with rudderc @@ -241,7 +241,7 @@ object YamlTechniqueSerializer { private def fromJsonMethodElem(methodElem: MethodElem): MethodItem = { def toReporting(logic: ReportingLogic): Reporting = { - import ReportingLogic._ + import ReportingLogic.* logic match { case FocusReport(component) => Reporting( @@ -282,7 +282,7 @@ object YamlTechniqueSerializer { } class YamlTechniqueSerializer(resourceFileService: ResourceFileService) { - import YamlTechniqueSerializer._ + import YamlTechniqueSerializer.* // shortcut to avoid having to import yamlOps / toIO, but can be avoided def toYml(technique: Technique): IOResult[String] = technique.toYaml().toIO diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ComplianceMode.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ComplianceMode.scala index 8a9f40f7287..3872b4129ae 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ComplianceMode.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ComplianceMode.scala @@ -37,7 +37,7 @@ package com.normation.rudder.reports -import net.liftweb.common._ +import net.liftweb.common.* /** * Define level of compliance: diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala index f8b91c377d7..3327e602241 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala @@ -39,7 +39,7 @@ package com.normation.rudder.reports import com.normation.errors.RudderError import com.normation.errors.Unexpected -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.Duration /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/LastProcessedReportRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/LastProcessedReportRepository.scala index be959756602..261b37a7b9d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/LastProcessedReportRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/LastProcessedReportRepository.scala @@ -37,15 +37,15 @@ package com.normation.rudder.reports.execution -import cats.implicits._ +import cats.implicits.* import com.normation.rudder.db.DB import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ -import doobie._ -import doobie.implicits._ -import net.liftweb.common._ +import com.normation.rudder.db.Doobie.* +import doobie.* +import doobie.implicits.* +import net.liftweb.common.* import org.joda.time.DateTime -import zio.interop.catz._ +import zio.interop.catz.* /** * Manage the status of the fetching of execution date per node @@ -66,7 +66,7 @@ trait LastProcessedReportRepository { class LastProcessedReportRepositoryImpl( db: Doobie ) extends LastProcessedReportRepository with Loggable { - import db._ + import db.* val PROP_EXECUTION_STATUS = "executionStatus" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepository.scala index 9ba6f8ec993..9d03438c5df 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepository.scala @@ -37,14 +37,14 @@ package com.normation.rudder.reports.execution -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.ComplianceDebugLoggerPure import com.normation.rudder.domain.logger.ReportLogger import com.normation.rudder.domain.logger.TimingDebugLoggerPure import com.normation.rudder.repository.CachedRepository -import com.normation.zio._ -import zio._ +import com.normation.zio.* +import zio.* /** * Service for reading or storing execution of Nodes diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepositoryImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepositoryImpl.scala index 44c1f30062f..e81d4231e5b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepositoryImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionRepositoryImpl.scala @@ -37,12 +37,12 @@ package com.normation.rudder.reports.execution -import cats.implicits._ +import cats.implicits.* import com.normation.errors.IOResult import com.normation.inventory.domain.NodeId import com.normation.rudder.db.DB import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ +import com.normation.rudder.db.Doobie.* import com.normation.rudder.domain.logger.TimingDebugLoggerPure import com.normation.rudder.domain.reports.ExpectedReportsSerialisation import com.normation.rudder.domain.reports.NodeAndConfigId @@ -50,14 +50,14 @@ import com.normation.rudder.domain.reports.NodeConfigId import com.normation.rudder.domain.reports.NodeExpectedReports import com.normation.rudder.repository.jdbc.PostgresqlInClause import com.normation.rudder.services.reports.NodeConfigurationService -import com.normation.zio._ -import doobie._ -import doobie.implicits._ -import net.liftweb.common._ +import com.normation.zio.* +import doobie.* +import doobie.implicits.* +import net.liftweb.common.* import org.joda.time.DateTime -import zio._ -import zio.interop.catz._ -import zio.syntax._ +import zio.* +import zio.interop.catz.* +import zio.syntax.* final case class RoReportsExecutionRepositoryImpl( db: Doobie, @@ -67,8 +67,8 @@ final case class RoReportsExecutionRepositoryImpl( jdbcMaxBatchSize: Int ) extends RoReportsExecutionRepository with Loggable { - import Doobie._ - import db._ + import Doobie.* + import db.* /** * Retrieve all runs that were not processed - for the moment, there are no limitation nor ordering/grouping @@ -243,7 +243,7 @@ final case class WoReportsExecutionRepositoryImpl( db: Doobie ) extends WoReportsExecutionRepository with Loggable { - import db._ + import db.* def setComplianceComputationDate(runs: List[AgentRunWithoutCompliance]): IOResult[Int] = { val updateKeys = runs.map(x => (x.agentRunId.nodeId.value, x.agentRunId.date, x.nodeConfigVersion.map(_.value))) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionService.scala index f67e0cf27c1..7d41e26d4b2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/execution/ReportsExecutionService.scala @@ -37,8 +37,8 @@ package com.normation.rudder.reports.execution -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.batch.FindNewReportsExecution import com.normation.rudder.db.DB @@ -49,7 +49,7 @@ import com.normation.rudder.repository.ReportsRepository import com.normation.rudder.services.reports.CacheComplianceQueueAction.UpdateCompliance import com.normation.rudder.services.reports.CachedFindRuleNodeStatusReports import com.normation.rudder.services.reports.CachedNodeChangesServiceImpl -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime import org.joda.time.format.PeriodFormat import scala.concurrent.duration.FiniteDuration diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala index 4032947059a..ec0f8290812 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala @@ -44,14 +44,14 @@ import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.services.TechniqueRepository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.domain.eventlog.RudderEventActor -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.utils.StringUuidGenerator import com.normation.utils.Utils -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import net.liftweb.common.Box import net.liftweb.common.Full import org.joda.time.DateTime @@ -661,8 +661,8 @@ class InitDirectivesTree( woDirectiveRepository: WoDirectiveRepository, uuidGen: StringUuidGenerator ) { - import com.normation.box._ - import com.normation.utils.Control._ + import com.normation.box.* + import com.normation.utils.Control.* def copyReferenceLib(includeSystem: Boolean = false): Box[Seq[ActiveTechniqueCategory]] = { def genUserCatId(fromCat: TechniqueCategory): ActiveTechniqueCategoryId = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/EventLogRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/EventLogRepository.scala index be677f31db8..778765a40d7 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/EventLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/EventLogRepository.scala @@ -70,7 +70,7 @@ import com.normation.rudder.domain.secret.Secret import com.normation.rudder.domain.workflows.ChangeRequestId import com.normation.rudder.domain.workflows.WorkflowStepChange import com.normation.rudder.services.eventlog.EventLogFactory -import doobie._ +import doobie.* import org.joda.time.DateTime trait EventLogRepository { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ExpectedReportsRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ExpectedReportsRepository.scala index e06b5aab3c0..029ab8a960d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ExpectedReportsRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ExpectedReportsRepository.scala @@ -36,14 +36,14 @@ */ package com.normation.rudder.repository -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import net.liftweb.common.Box -import org.joda.time._ +import org.joda.time.* trait UpdateExpectedReportsRepository { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/GitModificationRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/GitModificationRepository.scala index bc3b36f7f04..ed69dcd6291 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/GitModificationRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/GitModificationRepository.scala @@ -1,6 +1,6 @@ package com.normation.rudder.repository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.ModificationId import com.normation.rudder.db.DB import com.normation.rudder.git.GitCommitId diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ImportLibrary.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ImportLibrary.scala index 18073aa3973..26e082fba66 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ImportLibrary.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ImportLibrary.scala @@ -37,7 +37,7 @@ package com.normation.rudder.repository -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupCategory import com.normation.rudder.domain.policies.ActiveTechnique diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ItemArchiveManager.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ItemArchiveManager.scala index 623fff3691e..eb89439fdec 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ItemArchiveManager.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ItemArchiveManager.scala @@ -39,7 +39,7 @@ package com.normation.rudder.repository import com.normation.cfclerk.domain.SectionSpec import com.normation.cfclerk.domain.TechniqueName -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.EventLog import com.normation.eventlog.ModificationId diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupRepository.scala index ffa696e6fc1..9750c17b95d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupRepository.scala @@ -37,12 +37,12 @@ package com.normation.rudder.repository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.facts.nodes.CoreNodeFact import com.normation.utils.Utils import com.unboundid.ldif.LDIFChangeRecord diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeRepository.scala index 69638861aa8..faef58aa9bd 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/NodeRepository.scala @@ -37,13 +37,13 @@ package com.normation.rudder.repository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.KeyStatus import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.SecurityToken -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* /** * Node Repository diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ParameterRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ParameterRepository.scala index 9ba286a0ed1..acac8209101 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ParameterRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ParameterRepository.scala @@ -36,7 +36,7 @@ */ package com.normation.rudder.repository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.domain.archives.ParameterArchiveId diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ReportsRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ReportsRepository.scala index e0fa23acc17..49fcddbbbbd 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ReportsRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ReportsRepository.scala @@ -41,11 +41,11 @@ import com.normation.errors.IOResult import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.reports.execution.AgentRun import com.normation.rudder.reports.execution.AgentRunId import net.liftweb.common.Box -import org.joda.time._ +import org.joda.time.* /** * An overly simple repository for searching through the cfengine reports diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/RuleRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/RuleRepository.scala index a8a13ef2b24..9c45e340fbb 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/RuleRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/RuleRepository.scala @@ -36,11 +36,11 @@ */ package com.normation.rudder.repository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.domain.archives.RuleArchiveId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* /** * The directive repository. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ComplianceRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ComplianceRepository.scala index 9f8ccedea89..81846418378 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ComplianceRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ComplianceRepository.scala @@ -37,12 +37,12 @@ package com.normation.rudder.repository.jdbc -import cats.implicits._ -import com.normation.errors._ +import cats.implicits.* +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.inventory.domain.NodeId import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ +import com.normation.rudder.db.Doobie.* import com.normation.rudder.domain.logger.ReportLogger import com.normation.rudder.domain.reports.ComplianceLevel import com.normation.rudder.domain.reports.CompliancePercent @@ -50,13 +50,13 @@ import com.normation.rudder.domain.reports.NodeStatusReport import com.normation.rudder.domain.reports.RuleNodeStatusReport import com.normation.rudder.domain.reports.RunComplianceInfo import com.normation.rudder.repository.ComplianceRepository -import com.normation.rudder.services.reports._ -import doobie._ -import doobie.implicits._ +import com.normation.rudder.services.reports.* +import doobie.* +import doobie.implicits.* import net.liftweb.common.Box import org.joda.time.DateTime -import zio.interop.catz._ -import zio.syntax._ +import zio.interop.catz.* +import zio.syntax.* final case class RunCompliance( nodeId: NodeId, @@ -86,7 +86,7 @@ class ComplianceJdbcRepository( getSaveComplianceDetails: () => Box[Boolean], getSaveComplianceLevels: () => Box[Boolean] ) extends ComplianceRepository { - import doobie._ + import doobie.* val logger = ReportLogger diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepository.scala index 92b188b8a26..7b956e7710c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepository.scala @@ -37,24 +37,24 @@ package com.normation.rudder.repository.jdbc -import cats.implicits._ +import cats.implicits.* import cats.syntax.list.catsSyntaxList import com.normation.NamedZioLogger -import com.normation.errors._ -import com.normation.eventlog._ +import com.normation.errors.* +import com.normation.eventlog.* import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.db.Doobie.* +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.domain.workflows.ChangeRequestId import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.services.eventlog.EventLogFactory -import doobie._ -import doobie.implicits._ -import doobie.postgres.implicits._ +import doobie.* +import doobie.implicits.* +import doobie.postgres.implicits.* import doobie.util.fragments -import scala.xml._ -import zio.interop.catz._ -import zio.syntax._ +import scala.xml.* +import zio.interop.catz.* +import zio.syntax.* /** * The EventLog repository @@ -68,7 +68,7 @@ class EventLogJdbcRepository( override val eventLogFactory: EventLogFactory ) extends EventLogRepository with NamedZioLogger { - import doobie._ + import doobie.* override def loggerName: String = this.getClass.getName diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ExpectedReportsJdbcRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ExpectedReportsJdbcRepository.scala index 995471f498b..56238f633f3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ExpectedReportsJdbcRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ExpectedReportsJdbcRepository.scala @@ -38,27 +38,27 @@ package com.normation.rudder.repository.jdbc import cats.free.Free -import cats.implicits._ +import cats.implicits.* import com.normation.errors.IOResult import com.normation.inventory.domain.NodeId import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ +import com.normation.rudder.db.Doobie.* import com.normation.rudder.domain.logger.PolicyGenerationLogger import com.normation.rudder.domain.logger.ReportLogger import com.normation.rudder.domain.logger.TimingDebugLogger -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.reports.* import com.normation.rudder.repository.FindExpectedReportRepository import com.normation.rudder.repository.UpdateExpectedReportsRepository import com.normation.utils.Control.traverse -import doobie._ +import doobie.* import doobie.free.connection -import doobie.implicits._ -import net.liftweb.common._ -import net.liftweb.json._ +import doobie.implicits.* +import net.liftweb.common.* +import net.liftweb.json.* import org.joda.time.DateTime -import zio.interop.catz._ -import zio.syntax._ +import zio.interop.catz.* +import zio.syntax.* class PostgresqlInClause( // max number of element to switch from in (...) to in(values(...)) clause @@ -103,8 +103,8 @@ class FindExpectedReportsJdbcRepository( jdbcMaxBatchSize: Int ) extends FindExpectedReportRepository with Loggable { - import doobie._ - import pgInClause._ + import doobie.* + import pgInClause.* /* * Retrieve the expected reports by config version of the nodes. @@ -254,8 +254,8 @@ class UpdateExpectedReportsJdbcRepository( jdbcMaxBatchSize: Int ) extends UpdateExpectedReportsRepository { - import Doobie._ - import doobie._ + import Doobie.* + import doobie.* val logger = ReportLogger @@ -266,7 +266,7 @@ class UpdateExpectedReportsJdbcRepository( } def saveNodeExpectedReports(configs: List[NodeExpectedReports]): Box[Seq[NodeExpectedReports]] = { - import cats.implicits._ + import cats.implicits.* PolicyGenerationLogger.expectedReports.debug(s"Saving ${configs.size} nodes expected reports") configs match { case Nil => Full(Nil) @@ -357,7 +357,7 @@ class UpdateExpectedReportsJdbcRepository( configInfos: Map[NodeId, Vector[NodeConfigIdInfo]] ): Either[Throwable, Free[connection.ConnectionOp, List[NodeExpectedReports]]] = { - import Doobie._ + import Doobie.* val currentConfigs = configs.map(c => (c.nodeId, (c.nodeConfigId, c.beginDate))).toMap diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/GitModificationRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/GitModificationRepository.scala index 14c7d8c0930..683daf965dc 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/GitModificationRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/GitModificationRepository.scala @@ -1,18 +1,18 @@ package com.normation.rudder.repository.jdbc -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.ModificationId import com.normation.rudder.db.DB import com.normation.rudder.db.Doobie import com.normation.rudder.git.GitCommitId import com.normation.rudder.repository.GitModificationRepository -import doobie.implicits._ -import zio.interop.catz._ +import doobie.implicits.* +import zio.interop.catz.* class GitModificationRepositoryImpl( db: Doobie ) extends GitModificationRepository { - import db._ + import db.* def addCommit(commit: GitCommitId, modId: ModificationId): IOResult[DB.GitCommitJoin] = { val sql = sql""" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala index d5720983f93..b5f9a0f9369 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala @@ -37,28 +37,28 @@ package com.normation.rudder.repository.jdbc -import cats.implicits._ +import cats.implicits.* import com.normation.errors.IOResult import com.normation.inventory.domain.NodeId import com.normation.rudder.db.Doobie -import com.normation.rudder.db.Doobie._ +import com.normation.rudder.db.Doobie.* import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.domain.reports.Reports import com.normation.rudder.reports.execution.AgentRun import com.normation.rudder.reports.execution.AgentRunId import com.normation.rudder.repository.ReportsRepository -import doobie._ -import doobie.implicits._ +import doobie.* +import doobie.implicits.* import java.sql.Timestamp -import net.liftweb.common._ -import org.joda.time._ +import net.liftweb.common.* +import org.joda.time.* import org.joda.time.format.ISODateTimeFormat -import zio.interop.catz._ +import zio.interop.catz.* class ReportsJdbcRepository(doobie: Doobie) extends ReportsRepository with Loggable { - import doobie._ + import doobie.* val reports = "ruddersysevents" val archiveTable = "archivedruddersysevents" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/RudderPropertiesRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/RudderPropertiesRepository.scala index ea89d220be3..7d0ded25616 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/RudderPropertiesRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/RudderPropertiesRepository.scala @@ -37,15 +37,15 @@ package com.normation.rudder.repository.jdbc -import cats.implicits._ +import cats.implicits.* import com.normation.box.IOToBox import com.normation.errors.IOResult import com.normation.rudder.db.Doobie import com.normation.rudder.repository.RudderPropertiesRepository -import doobie._ -import doobie.implicits._ -import net.liftweb.common._ -import zio.interop.catz._ +import doobie.* +import doobie.implicits.* +import net.liftweb.common.* +import zio.interop.catz.* class RudderPropertiesRepositoryImpl( db: Doobie @@ -54,7 +54,7 @@ class RudderPropertiesRepositoryImpl( val PROP_REPORT_LAST_ID = "reportLoggerLastId" val PROP_REPORT_HANDLER_LAST_ID = "reportHandlerLastId" - import db._ + import db.* def getLastId(key: String): IOResult[Option[Long]] = { val sql = sql"select value from rudderproperties where name=${key}" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala index cda30b2191e..c5b2444a0b9 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala @@ -37,12 +37,12 @@ package com.normation.rudder.repository.json -import cats._ -import cats.implicits._ +import cats.* +import cats.implicits.* import com.normation.rudder.domain.policies.JsonTagExtractor -import com.normation.utils.Control._ -import net.liftweb.common._ -import net.liftweb.json._ +import com.normation.utils.Control.* +import net.liftweb.common.* +import net.liftweb.json.* trait JsonExtractorUtils[A[_]] { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDiffMapper.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDiffMapper.scala index a7dac1c5622..fceec444ad1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDiffMapper.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDiffMapper.scala @@ -37,20 +37,20 @@ package com.normation.rudder.repository.ldap -import cats.implicits._ -import com.normation.cfclerk.domain._ -import com.normation.errors._ -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core.{InventoryMappingRudderError => Err} -import com.normation.inventory.ldap.core.LDAPConstants._ +import cats.implicits.* +import com.normation.cfclerk.domain.* +import com.normation.errors.* +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.InventoryMappingRudderError as Err +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.ldap.ldif.LDIFNoopChangeRecord -import com.normation.ldap.sdk._ -import com.normation.rudder.api._ +import com.normation.ldap.sdk.* +import com.normation.rudder.api.* import com.normation.rudder.api.ApiAccountKind.PublicApi -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.logger.ApplicationLogger -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.AddGlobalParameterDiff import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GlobalParameter @@ -60,7 +60,7 @@ import com.normation.rudder.domain.properties.ModifyGlobalParameterDiff import com.normation.rudder.domain.properties.PropertyProvider import com.normation.rudder.repository.json.DataExtractor import com.normation.rudder.rule.category.RuleCategoryId -import com.normation.rudder.services.queries._ +import com.normation.rudder.services.queries.* import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.Modification import com.unboundid.ldap.sdk.ModificationType.ADD @@ -70,7 +70,7 @@ import com.unboundid.ldif.LDIFAddChangeRecord import com.unboundid.ldif.LDIFChangeRecord import com.unboundid.ldif.LDIFModifyChangeRecord import com.unboundid.ldif.LDIFModifyDNChangeRecord -import net.liftweb.common._ +import net.liftweb.common.* import scala.util.control.NonFatal class LDAPDiffMapper( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala index feb38cf9bdc..19a61bf3665 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala @@ -37,7 +37,7 @@ package com.normation.rudder.repository.ldap -import cats.implicits._ +import cats.implicits.* import com.normation.GitVersion import com.normation.NamedZioLogger import com.normation.cfclerk.domain.SectionSpec @@ -46,20 +46,20 @@ import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.services.TechniqueRepository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.ldap.core.LDAPConstants.A_NAME import com.normation.inventory.ldap.core.LDAPConstants.A_OC import com.normation.inventory.ldap.core.LDAPConstants.A_REV_ID import com.normation.ldap.ldif.LDIFNoopChangeRecord -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ -import com.normation.ldap.sdk.LDAPIOResult._ -import com.normation.ldap.sdk.syntax._ +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* +import com.normation.ldap.sdk.LDAPIOResult.* +import com.normation.ldap.sdk.syntax.* import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.RudderLDAPConstants.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.repository.ActiveTechniqueCategoryOrdering import com.normation.rudder.repository.CategoryWithActiveTechniques import com.normation.rudder.repository.EventLogRepository @@ -77,8 +77,8 @@ import com.unboundid.ldap.sdk.Filter import net.liftweb.json.JsonAST import org.joda.time.DateTime import scala.collection.immutable.SortedMap -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class RoLDAPDirectiveRepository( val rudderDit: RudderDit, @@ -99,7 +99,7 @@ class RoLDAPDirectiveRepository( case r => AND(EQ(A_DIRECTIVE_UUID, id.uid.value), EQ(A_REV_ID, r.value)) } con - .searchSub(rudderDit.ACTIVE_TECHNIQUES_LIB.dn, filter, attributes: _*) + .searchSub(rudderDit.ACTIVE_TECHNIQUES_LIB.dn, filter, attributes*) .flatMap(piEntries => { piEntries.size match { case 0 => None.succeed @@ -239,7 +239,7 @@ class RoLDAPDirectiveRepository( .readLock(for { con <- ldap category <- getCategoryEntry(con, id).notOptional(s"Entry with ID '${id.value}' was not found") - entries <- con.searchSub(category.dn, IS(OC_DIRECTIVE), Seq[String](): _*) + entries <- con.searchSub(category.dn, IS(OC_DIRECTIVE), Seq[String]()*) results <- ZIO.foreach(entries)(x => mapper.entry2Directive(x).toIO) } yield { results.nonEmpty @@ -356,7 +356,7 @@ class RoLDAPDirectiveRepository( def getCategoryEntry(con: RoLDAPConnection, id: ActiveTechniqueCategoryId, attributes: String*): IOResult[Option[LDAPEntry]] = { userLibMutex.readLock(for { categoryEntries <- - con.searchSub(rudderDit.ACTIVE_TECHNIQUES_LIB.dn, EQ(A_TECHNIQUE_CATEGORY_UUID, id.value), attributes: _*) + con.searchSub(rudderDit.ACTIVE_TECHNIQUES_LIB.dn, EQ(A_TECHNIQUE_CATEGORY_UUID, id.value), attributes*) entry <- categoryEntries.size match { case 0 => None.succeed @@ -511,7 +511,7 @@ class RoLDAPDirectiveRepository( def getUPTEntry(con: RoLDAPConnection, id: ActiveTechniqueId, attributes: String*): IOResult[Option[LDAPEntry]] = { userLibMutex.readLock { - getUPTEntry[ActiveTechniqueId](con, id, id => EQ(A_ACTIVE_TECHNIQUE_UUID, id.value), attributes: _*) + getUPTEntry[ActiveTechniqueId](con, id, id => EQ(A_ACTIVE_TECHNIQUE_UUID, id.value), attributes*) } } @@ -527,7 +527,7 @@ class RoLDAPDirectiveRepository( attributes: String* ): LDAPIOResult[Option[LDAPEntry]] = { for { - uptEntries <- con.searchSub(rudderDit.ACTIVE_TECHNIQUES_LIB.dn, filter(id), attributes: _*) + uptEntries <- con.searchSub(rudderDit.ACTIVE_TECHNIQUES_LIB.dn, filter(id), attributes*) entry <- uptEntries.size match { case 0 => None.succeed case 1 => Some(uptEntries(0)).succeed @@ -571,8 +571,8 @@ class RoLDAPDirectiveRepository( FullActiveTechnique( id = at.id, techniqueName = at.techniqueName, - techniques = SortedMap(techniqueRepository.getByName(at.techniqueName).toSeq: _*), - acceptationDatetimes = SortedMap(at.acceptationDatetimes.toSeq: _*), + techniques = SortedMap(techniqueRepository.getByName(at.techniqueName).toSeq*), + acceptationDatetimes = SortedMap(at.acceptationDatetimes.toSeq*), directives = maps.directivesByActiveTechnique.getOrElse(at.id, Nil), isEnabled = at.isEnabled, isSystem = at.isSystem @@ -615,7 +615,7 @@ class RoLDAPDirectiveRepository( */ val emptyAll = AllMaps(Map(), Map(), Map(), Map(), Map()) - import rudderDit.ACTIVE_TECHNIQUES_LIB._ + import rudderDit.ACTIVE_TECHNIQUES_LIB.* def mappingError(current: AllMaps, e: LDAPEntry, err: RudderError): AllMaps = { val error = Chained(s"Error when mapping entry with DN '${e.dn.toString}' from directive library", err) @@ -708,7 +708,7 @@ class WoLDAPDirectiveRepository( autoExportOnModify: Boolean ) extends WoDirectiveRepository with NamedZioLogger { - import roDirectiveRepos._ + import roDirectiveRepos.* override def loggerName: String = this.getClass.getName diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala index fed66a92483..82f2b7b5b1a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala @@ -37,35 +37,35 @@ package com.normation.rudder.repository.ldap -import cats.implicits._ +import cats.implicits.* import com.normation.GitVersion import com.normation.GitVersion.ParseRev import com.normation.GitVersion.Revision import com.normation.NamedZioLogger -import com.normation.cfclerk.domain._ -import com.normation.errors._ -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core.{InventoryMappingRudderError => Err} +import com.normation.cfclerk.domain.* +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.inventory.ldap.core.InventoryDit import com.normation.inventory.ldap.core.InventoryMapper -import com.normation.inventory.ldap.core.InventoryMappingResult._ +import com.normation.inventory.ldap.core.InventoryMappingResult.* import com.normation.inventory.ldap.core.InventoryMappingRudderError import com.normation.inventory.ldap.core.InventoryMappingRudderError.MalformedDN import com.normation.inventory.ldap.core.InventoryMappingRudderError.UnexpectedObject +import com.normation.inventory.ldap.core.InventoryMappingRudderError as Err import com.normation.inventory.ldap.core.LDAPConstants -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.syntax._ -import com.normation.rudder.api._ +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.syntax.* +import com.normation.rudder.api.* import com.normation.rudder.domain.NodeDit import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.appconfig.RudderWebProperty import com.normation.rudder.domain.appconfig.RudderWebPropertyName import com.normation.rudder.domain.logger.ApplicationLogger -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.nodes.Node -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GlobalParameter @@ -75,20 +75,20 @@ import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.domain.properties.PropertyProvider import com.normation.rudder.facts.nodes.NodeSecurityContext import com.normation.rudder.facts.nodes.SecurityTag -import com.normation.rudder.reports._ +import com.normation.rudder.reports.* import com.normation.rudder.repository.json.DataExtractor.CompleteJson import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.rule.category.RuleCategoryId -import com.normation.rudder.services.queries._ +import com.normation.rudder.services.queries.* import com.unboundid.ldap.sdk.DN -import net.liftweb.json._ +import net.liftweb.json.* import net.liftweb.json.JsonAST.JObject -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import org.joda.time.DateTime import scala.util.control.NonFatal -import zio._ -import zio.json._ -import zio.syntax._ +import zio.* +import zio.json.* +import zio.syntax.* object NodeStateEncoder { implicit def enc(state: NodeState): String = state.name @@ -117,7 +117,7 @@ class LDAPEntityMapper( ////////////////////////////// Node ////////////////////////////// def nodeToEntry(node: Node): LDAPEntry = { - import NodeStateEncoder._ + import NodeStateEncoder.* val entry = { if (node.isPolicyServer) { nodeDit.NODES.NODE.policyServerNodeModel(node.id) @@ -145,13 +145,13 @@ class LDAPEntityMapper( // because we don't want to store them there. entry.resetValuesTo( A_NODE_PROPERTY, - node.properties.collect { case p if (p.provider != Some(NodeProperty.customPropertyProvider)) => p.toData }: _* + node.properties.collect { case p if (p.provider != Some(NodeProperty.customPropertyProvider)) => p.toData }* ) node.nodeReportingConfiguration.heartbeatConfiguration match { case Some(heatbeatConfiguration) => val json = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* ("overrides" -> heatbeatConfiguration.overrides) ~ ("heartbeatPeriod" -> heatbeatConfiguration.heartbeatPeriod) } @@ -177,14 +177,14 @@ class LDAPEntityMapper( } def unserializeAgentRunInterval(value: String): AgentRunInterval = { - import net.liftweb.json.JsonParser._ + import net.liftweb.json.JsonParser.* implicit val formats: Formats = DefaultFormats parse(value).extract[AgentRunInterval] } def unserializeNodeHeartbeatConfiguration(value: String): HeartbeatConfiguration = { - import net.liftweb.json.JsonParser._ + import net.liftweb.json.JsonParser.* implicit val formats: Formats = DefaultFormats parse(value).extract[HeartbeatConfiguration] @@ -440,7 +440,7 @@ class LDAPEntityMapper( * Build the ActiveTechniqueCategoryId from the given DN */ def dn2ActiveTechniqueCategoryId(dn: DN): ActiveTechniqueCategoryId = { - import net.liftweb.common._ + import net.liftweb.common.* rudderDit.ACTIVE_TECHNIQUES_LIB.getCategoryIdValue(dn) match { case Full(value) => ActiveTechniqueCategoryId(value) case e: EmptyBox => @@ -449,7 +449,7 @@ class LDAPEntityMapper( } def dn2ActiveTechniqueId(dn: DN): ActiveTechniqueId = { - import net.liftweb.common._ + import net.liftweb.common.* rudderDit.ACTIVE_TECHNIQUES_LIB.getActiveTechniqueId(dn) match { case Full(value) => ActiveTechniqueId(value) case e: EmptyBox => @@ -461,7 +461,7 @@ class LDAPEntityMapper( * Build the Group Category Id from the given DN */ def dn2NodeGroupCategoryId(dn: DN): NodeGroupCategoryId = { - import net.liftweb.common._ + import net.liftweb.common.* rudderDit.GROUP.getCategoryIdValue(dn) match { case Full(value) => NodeGroupCategoryId(value) case e: EmptyBox => @@ -473,7 +473,7 @@ class LDAPEntityMapper( * Build the Node Group Category Id from the given DN */ def dn2NodeGroupId(dn: DN): NodeGroupId = { - import net.liftweb.common._ + import net.liftweb.common.* rudderDit.GROUP.getGroupId(dn) match { case Full(value) => NodeGroupId.parse(value) match { @@ -488,7 +488,7 @@ class LDAPEntityMapper( * Build the Rule Category Id from the given DN */ def dn2RuleCategoryId(dn: DN): RuleCategoryId = { - import net.liftweb.common._ + import net.liftweb.common.* rudderDit.RULECATEGORY.getCategoryIdValue(dn) match { case Full(value) => RuleCategoryId(value) case e: EmptyBox => @@ -497,7 +497,7 @@ class LDAPEntityMapper( } def dn2LDAPDirectiveUid(dn: DN): DirectiveUid = { - import net.liftweb.common._ + import net.liftweb.common.* rudderDit.ACTIVE_TECHNIQUES_LIB.getLDAPDirectiveUid(dn) match { case Full(value) => DirectiveUid(value) case e: EmptyBox => @@ -506,7 +506,7 @@ class LDAPEntityMapper( } def dn2RuleUid(dn: DN): RuleUid = { - import net.liftweb.common._ + import net.liftweb.common.* rudderDit.RULES.getRuleUid(dn) match { case Full(value) => RuleUid(value) case e: EmptyBox => throw new RuntimeException("The dn %s is not a valid Rule UID. Error was: %s".format(dn, e.toString)) @@ -562,7 +562,7 @@ class LDAPEntityMapper( def unserializeAcceptations(value: String): PureResult[Map[TechniqueVersion, DateTime]] = { import net.liftweb.json.JsonAST.JField import net.liftweb.json.JsonAST.JString - import net.liftweb.json.JsonParser._ + import net.liftweb.json.JsonParser.* parse(value) match { case JObject(fields) => @@ -773,7 +773,7 @@ class LDAPEntityMapper( s"Some properties from group '${group.name}' (${group.id.serialize}) were ignored because their name was blank and it's forbidden" ) } - entry.resetValuesTo(A_JSON_PROPERTY, props: _*) + entry.resetValuesTo(A_JSON_PROPERTY, props*) entry } @@ -878,7 +878,7 @@ class LDAPEntityMapper( parentDN ) - entry.resetValuesTo(A_DIRECTIVE_VARIABLES, policyVariableToSeq(directive.parameters): _*) + entry.resetValuesTo(A_DIRECTIVE_VARIABLES, policyVariableToSeq(directive.parameters)*) entry.resetValuesTo(A_NAME, directive.name) entry.resetValuesTo(A_DESCRIPTION, directive.shortDescription) entry.resetValuesTo(A_LONG_DESCRIPTION, directive.longDescription.toString) @@ -995,8 +995,8 @@ class LDAPEntityMapper( rule.categoryId.value ) - entry.resetValuesTo(A_RULE_TARGET, rule.targets.map(_.target).toSeq: _*) - entry.resetValuesTo(A_DIRECTIVE_UUID, rule.directiveIds.map(_.serialize).toSeq: _*) + entry.resetValuesTo(A_RULE_TARGET, rule.targets.map(_.target).toSeq*) + entry.resetValuesTo(A_DIRECTIVE_UUID, rule.directiveIds.map(_.serialize).toSeq*) entry.resetValuesTo(A_DESCRIPTION, rule.shortDescription) entry.resetValuesTo(A_LONG_DESCRIPTION, rule.longDescription.toString) entry.resetValuesTo(A_SERIALIZED_TAGS, net.liftweb.json.compactRender(JsonTagSerialisation.serializeTags(rule.tags))) @@ -1007,15 +1007,15 @@ class LDAPEntityMapper( ////////////////////////////// API Accounts ////////////////////////////// def serApiAcl(authz: List[ApiAclElement]): String = { - import net.liftweb.json.Serialization._ - import net.liftweb.json._ + import net.liftweb.json.Serialization.* + import net.liftweb.json.* implicit val formats: Formats = DefaultFormats val toSerialize = JsonApiAcl(acl = authz.map(a => JsonApiAuthz(path = a.path.value, actions = a.actions.toList.map(_.name)))) write[JsonApiAcl](toSerialize) } def unserApiAcl(s: String): Either[String, List[ApiAclElement]] = { - import cats.implicits._ - import net.liftweb.json._ + import cats.implicits.* + import net.liftweb.json.* implicit val formats = net.liftweb.json.DefaultFormats for { json <- parseOpt(s).toRight(s"The following string can not be parsed as a JSON object for API ACL: ${s}") @@ -1135,7 +1135,7 @@ class LDAPEntityMapper( def apiAccount2Entry(principal: ApiAccount): LDAPEntry = { val mod = LDAPEntry(rudderDit.API_ACCOUNTS.API_ACCOUNT.dn(principal.id)) - mod.resetValuesTo(A_OC, OC.objectClassNames(OC_API_ACCOUNT).toSeq: _*) + mod.resetValuesTo(A_OC, OC.objectClassNames(OC_API_ACCOUNT).toSeq*) mod.resetValuesTo(A_API_UUID, principal.id.value) mod.resetValuesTo(A_NAME, principal.name.value) mod.resetValuesTo(A_CREATION_DATETIME, GeneralizedTime(principal.creationDate).toString) @@ -1169,7 +1169,7 @@ class LDAPEntityMapper( * (and we remove it for 6.1 and above). */ def entry2Parameter(e: LDAPEntry): InventoryMappingPure[GlobalParameter] = { - import com.normation.rudder.domain.properties.GenericProperty._ + import com.normation.rudder.domain.properties.GenericProperty.* if (e.isA(OC_PARAMETER)) { // OK, translate for { @@ -1193,7 +1193,7 @@ class LDAPEntityMapper( } def parameter2Entry(parameter: GlobalParameter): LDAPEntry = { - import com.normation.rudder.domain.properties.GenericProperty._ + import com.normation.rudder.domain.properties.GenericProperty.* val entry = rudderDit.PARAMETERS.parameterModel( parameter.name ) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPGitRevisionProvider.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPGitRevisionProvider.scala index 9cbb44de6e0..fda7c2565ff 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPGitRevisionProvider.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPGitRevisionProvider.scala @@ -38,7 +38,7 @@ package com.normation.rudder.repository.ldap import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.ldap.core.LDAPConstants.A_OC import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection @@ -49,8 +49,8 @@ import com.normation.rudder.git.GitFindUtils import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.git.GitRevisionProvider import org.eclipse.jgit.lib.ObjectId -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupRepository.scala index 196e468522d..db1651e3bda 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupRepository.scala @@ -37,9 +37,9 @@ package com.normation.rudder.repository.ldap -import cats.implicits._ +import cats.implicits.* import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId @@ -55,10 +55,10 @@ import com.normation.ldap.sdk.BuildFilter.NOT import com.normation.ldap.sdk.BuildFilter.OR import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.LDAPEntry -import com.normation.ldap.sdk.LDAPIOResult._ +import com.normation.ldap.sdk.LDAPIOResult.* import com.normation.ldap.sdk.RoLDAPConnection import com.normation.ldap.sdk.RwLDAPConnection -import com.normation.ldap.sdk.syntax._ +import com.normation.ldap.sdk.syntax.* import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.RudderLDAPConstants.A_GROUP_CATEGORY_UUID import com.normation.rudder.domain.RudderLDAPConstants.A_IS_ENABLED @@ -68,10 +68,10 @@ import com.normation.rudder.domain.RudderLDAPConstants.A_RULE_TARGET import com.normation.rudder.domain.RudderLDAPConstants.OC_GROUP_CATEGORY import com.normation.rudder.domain.RudderLDAPConstants.OC_RUDDER_NODE_GROUP import com.normation.rudder.domain.RudderLDAPConstants.OC_SPECIAL_TARGET -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.nodes.NodeGroupCategory import com.normation.rudder.domain.nodes.NodeGroupCategoryId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.policies.GroupTarget import com.normation.rudder.repository.CategoryAndNodeGroup import com.normation.rudder.repository.EventLogRepository @@ -86,10 +86,10 @@ import com.normation.utils.StringUuidGenerator import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.Filter import com.unboundid.ldif.LDIFChangeRecord -import net.liftweb.common._ +import net.liftweb.common.* import scala.collection.immutable.SortedMap -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class RoLDAPNodeGroupRepository( val rudderDit: RudderDit, @@ -141,7 +141,7 @@ class RoLDAPNodeGroupRepository( } def getSGEntry(con: RoLDAPConnection, id: NodeGroupId, attributes: String*): IOResult[Option[LDAPEntry]] = { - con.searchSub(rudderDit.GROUP.dn, EQ(A_NODE_GROUP_UUID, id.serialize), attributes: _*).flatMap { srvEntries => + con.searchSub(rudderDit.GROUP.dn, EQ(A_NODE_GROUP_UUID, id.serialize), attributes*).flatMap { srvEntries => srvEntries.size match { case 0 => None.succeed case 1 => Some(srvEntries(0)).succeed @@ -159,7 +159,7 @@ class RoLDAPNodeGroupRepository( */ def getCategoryEntry(con: RoLDAPConnection, id: NodeGroupCategoryId, attributes: String*): IOResult[Option[LDAPEntry]] = { groupLibMutex.readLock { - con.searchSub(rudderDit.GROUP.dn, EQ(A_GROUP_CATEGORY_UUID, id.value), attributes: _*) + con.searchSub(rudderDit.GROUP.dn, EQ(A_GROUP_CATEGORY_UUID, id.value), attributes*) }.flatMap { categoryEntries => categoryEntries.size match { case 0 => None.succeed @@ -434,7 +434,7 @@ class RoLDAPNodeGroupRepository( con <- ldap // for each directive entry, map it. if one fails, all fails entries <- - groupLibMutex.readLock(con.searchSub(rudderDit.GROUP.dn, OR(ids.map(id => EQ(A_NODE_GROUP_UUID, id.serialize)): _*))) + groupLibMutex.readLock(con.searchSub(rudderDit.GROUP.dn, OR(ids.map(id => EQ(A_NODE_GROUP_UUID, id.serialize))*))) groups <- ZIO.foreach(entries)(groupEntry => { mapper .entry2NodeGroup(groupEntry) @@ -505,7 +505,7 @@ class RoLDAPNodeGroupRepository( def findGroupWithAnyMember(nodeIds: Seq[NodeId]): IOResult[Seq[NodeGroupId]] = { val filter = AND( IS(OC_RUDDER_NODE_GROUP), - OR(nodeIds.distinct.map(nodeId => EQ(LDAPConstants.A_NODE_UUID, nodeId.value)): _*) + OR(nodeIds.distinct.map(nodeId => EQ(LDAPConstants.A_NODE_UUID, nodeId.value))*) ) findGroupWithFilter(filter) } @@ -519,7 +519,7 @@ class RoLDAPNodeGroupRepository( def findGroupWithAllMember(nodeIds: Seq[NodeId]): IOResult[Seq[NodeGroupId]] = { val filter = AND( IS(OC_RUDDER_NODE_GROUP), - AND(nodeIds.distinct.map(nodeId => EQ(LDAPConstants.A_NODE_UUID, nodeId.value)): _*) + AND(nodeIds.distinct.map(nodeId => EQ(LDAPConstants.A_NODE_UUID, nodeId.value))*) ) findGroupWithFilter(filter) } @@ -561,7 +561,7 @@ class RoLDAPNodeGroupRepository( */ val emptyAll = AllMaps(Map(), Map(), Map()) - import rudderDit.GROUP._ + import rudderDit.GROUP.* def mappingError(current: AllMaps, e: LDAPEntry, err: RudderError): AllMaps = { val error = @@ -639,7 +639,7 @@ class WoLDAPNodeGroupRepository( ) extends WoNodeGroupRepository with Loggable { repo => - import roGroupRepo._ + import roGroupRepo.* /** * Check if a group category exist with the given name diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala index 81bf284f350..4d1bd6ed7e2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala @@ -37,7 +37,7 @@ package com.normation.rudder.repository.ldap import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.AgentInfo @@ -47,19 +47,19 @@ import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.SecurityToken import com.normation.inventory.ldap.core.InventoryDit import com.normation.ldap.ldif.LDIFNoopChangeRecord -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.LDAPIOResult._ +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.LDAPIOResult.* import com.normation.rudder.domain.Constants import com.normation.rudder.domain.NodeDit -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.repository.WoNodeRepository import com.normation.rudder.services.reports.CacheComplianceQueueAction import com.normation.rudder.services.reports.CacheExpectedReportAction import com.normation.rudder.services.reports.InvalidateCache import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class WoLDAPNodeRepository( nodeDit: NodeDit, @@ -77,12 +77,12 @@ class WoLDAPNodeRepository( override def loggerName: String = this.getClass.getName def updateNode(node: Node, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[Node] = { - import com.normation.rudder.services.nodes.NodeInfoService.{nodeInfoAttributes => attrs} + import com.normation.rudder.services.nodes.NodeInfoService.nodeInfoAttributes as attrs nodeLibMutex.writeLock( for { con <- ldap existingEntry <- con - .get(nodeDit.NODES.NODE.dn(node.id.value), attrs: _*) + .get(nodeDit.NODES.NODE.dn(node.id.value), attrs*) .notOptional(s"Cannot update node with id ${node.id.value} : there is no node with that id") oldNode <- mapper @@ -152,9 +152,9 @@ class WoLDAPNodeRepository( dn = acceptedDit.NODES.NODE.dn(nodeId.value) result <- if (agentsInfo == newInfo) LDIFNoopChangeRecord(dn).succeed else { - import com.normation.inventory.domain.AgentInfoSerialisation._ + import com.normation.inventory.domain.AgentInfoSerialisation.* val e = LDAPEntry(dn) - e.addValues(A_AGENTS_NAME, newInfo._1.map(_.toJsonString): _*) + e.addValues(A_AGENTS_NAME, newInfo._1.map(_.toJsonString)*) e.addValues(A_KEY_STATUS, newInfo._2.value) con.save(e).chainError(s"Error when saving node entry in repository: ${e}") @@ -177,8 +177,8 @@ class WoLDAPNodeRepository( */ def checkNodeModification(oldNode: Node, newNode: Node): IOResult[Unit] = { // use cats validation - import cats.data._ - import cats.implicits._ + import cats.data.* + import cats.implicits.* type ValidationResult = ValidatedNel[String, Unit] val ok = ().validNel diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPParameterRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPParameterRepository.scala index 01696194d54..728fc0962c6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPParameterRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPParameterRepository.scala @@ -36,14 +36,14 @@ */ package com.normation.rudder.repository.ldap -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ -import com.normation.ldap.sdk.LDAPIOResult._ +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* +import com.normation.ldap.sdk.LDAPIOResult.* import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.archives.ParameterArchiveId import com.normation.rudder.domain.logger.ApplicationLoggerPure import com.normation.rudder.domain.properties.AddGlobalParameterDiff @@ -52,14 +52,14 @@ import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.properties.ModifyGlobalParameterDiff import com.normation.rudder.domain.properties.PropertyProvider -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.services.user.PersonIdentService import com.unboundid.ldif.LDIFChangeRecord import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class RoLDAPParameterRepository( val rudderDit: RudderDit, @@ -120,7 +120,7 @@ class WoLDAPParameterRepository( ) extends WoParameterRepository { repo => - import roLDAPParameterRepository._ + import roLDAPParameterRepository.* def saveParameter( parameter: GlobalParameter, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPRuleRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPRuleRepository.scala index f2233e296cd..37944348355 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPRuleRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPRuleRepository.scala @@ -40,24 +40,24 @@ package ldap import com.normation.GitVersion import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.ldap.core.LDAPConstants.A_NAME -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ -import com.normation.ldap.sdk.LDAPIOResult._ -import com.normation.ldap.sdk.syntax._ +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* +import com.normation.ldap.sdk.LDAPIOResult.* +import com.normation.ldap.sdk.syntax.* import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.archives.RuleArchiveId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.services.user.PersonIdentService import com.unboundid.ldif.LDIFChangeRecord import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class RoLDAPRuleRepository( val rudderDit: RudderDit, @@ -136,7 +136,7 @@ class WoLDAPRuleRepository( ) extends WoRuleRepository with NamedZioLogger { repo => - import roLDAPRuleRepository._ + import roLDAPRuleRepository.* override def loggerName: String = this.getClass.getName diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapGroupLibrary.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapGroupLibrary.scala index a87813d7675..19764641961 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapGroupLibrary.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapGroupLibrary.scala @@ -38,13 +38,13 @@ package com.normation.rudder.repository.ldap import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection -import com.normation.ldap.sdk.syntax._ +import com.normation.ldap.sdk.syntax.* import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.RudderLDAPConstants.* +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.policies.GroupTarget import com.normation.rudder.repository.ImportGroupLibrary import com.normation.rudder.repository.NodeGroupCategoryContent @@ -54,8 +54,8 @@ import com.unboundid.ldap.sdk.RDN import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat import scala.annotation.tailrec -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* trait LDAPImportLibraryUtil extends NamedZioLogger { @@ -74,7 +74,7 @@ trait LDAPImportLibraryUtil extends NamedZioLogger { // we may miss a parent. But it should not be allowed, so we consider such cases // as errors import com.normation.ldap.sdk.BuildFilter.EQ - import com.normation.ldap.sdk._ + import com.normation.ldap.sdk.* // a method that change the root of a dn from archive to user lib root def setUserLibRoot(dn: DN): Option[DN] = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapPolicyLibrary.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapPolicyLibrary.scala index 214b306391f..7be5caaa61d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapPolicyLibrary.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPSwapPolicyLibrary.scala @@ -38,13 +38,13 @@ package com.normation.rudder.repository.ldap import com.normation.cfclerk.domain.TechniqueName -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.ldap.core.LDAPConstants.A_OC import com.normation.ldap.sdk.GeneralizedTime import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.policies.ActiveTechniqueCategory import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId import com.normation.rudder.domain.policies.ActiveTechniqueId @@ -56,8 +56,8 @@ import com.normation.rudder.repository.ImportTechniqueLibrary import com.unboundid.ldap.sdk.DN import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class ImportTechniqueLibraryImpl( rudderDit: RudderDit, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/Lock.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/Lock.scala index 677bd7631df..fda7bcc6364 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/Lock.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/Lock.scala @@ -21,8 +21,8 @@ package com.normation.rudder.repository.ldap import com.normation.NamedZioLogger -import com.normation.errors._ -import com.normation.zio._ +import com.normation.errors.* +import com.normation.zio.* import zio.ZIO import zio.stm.TReentrantLock diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala index d4fc34d4072..daa51995c77 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala @@ -44,7 +44,7 @@ import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.services.TechniqueRepository import com.normation.cfclerk.xmlparsers.TechniqueParser -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.AgentType @@ -56,7 +56,7 @@ import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupCategory import com.normation.rudder.domain.nodes.NodeGroupCategoryId import com.normation.rudder.domain.nodes.NodeGroupId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.git.GitArchiveId import com.normation.rudder.git.GitArchiverFullCommitUtils @@ -66,18 +66,18 @@ import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.ncf.ResourceFile import com.normation.rudder.ncf.ResourceFileState import com.normation.rudder.ncf.TechniqueCompiler -import com.normation.rudder.repository._ -import com.normation.rudder.services.marshalling._ +import com.normation.rudder.repository.* +import com.normation.rudder.services.marshalling.* import com.normation.rudder.services.user.PersonIdentService import java.io.File -import net.liftweb.common._ +import net.liftweb.common.* import org.apache.commons.io.FileUtils import org.eclipse.jgit.lib.PersonIdent import scala.collection.mutable.Buffer import scala.xml.Source import scala.xml.XML -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class GitRuleArchiverImpl( override val gitRepo: GitRepositoryProvider, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitParseRudderObjects.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitParseRudderObjects.scala index 35b28a6b67c..7146bb1ad9b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitParseRudderObjects.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitParseRudderObjects.scala @@ -47,7 +47,7 @@ import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.xmlparsers.TechniqueParser -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.configuration.DirectiveRevisionRepository import com.normation.rudder.configuration.GroupAndCat import com.normation.rudder.configuration.GroupRevisionRepository @@ -70,7 +70,7 @@ import com.normation.rudder.git.GitFindUtils import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.git.GitRevisionProvider import com.normation.rudder.migration.XmlEntityMigration -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.services.marshalling.ActiveTechniqueCategoryUnserialisation import com.normation.rudder.services.marshalling.ActiveTechniqueUnserialisation @@ -82,14 +82,14 @@ import com.normation.rudder.services.marshalling.RuleCategoryUnserialisation import com.normation.rudder.services.marshalling.RuleUnserialisation import com.normation.utils.UuidRegex import com.normation.utils.Version -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import java.io.InputStream import java.nio.file.Paths import org.eclipse.jgit.lib.ObjectId import org.eclipse.jgit.lib.Repository import org.eclipse.jgit.treewalk.TreeWalk -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* final case class GitRootCategory( root: String diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala index 7a63f64904d..64748e3bc99 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ItemArchiveManagerImpl.scala @@ -37,14 +37,14 @@ package com.normation.rudder.repository.xml -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.EventLog import com.normation.eventlog.ModificationId import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.domain.Constants.FULL_ARCHIVE_TAG -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.domain.logger.GitArchiveLoggerPure import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId import com.normation.rudder.git.GitArchiveId @@ -52,20 +52,20 @@ import com.normation.rudder.git.GitArchiverFullCommitUtils import com.normation.rudder.git.GitCommitId import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.git.GitRevisionProvider -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.rule.category.GitRuleCategoryArchiver import com.normation.rudder.rule.category.ImportRuleCategoryLibrary import com.normation.rudder.rule.category.RoRuleCategoryRepository import com.normation.rudder.services.queries.DynGroupUpdaterService -import com.normation.zio._ +import com.normation.zio.* import java.io.File import org.apache.commons.io.FileUtils -import org.eclipse.jgit.api._ +import org.eclipse.jgit.api.* import org.eclipse.jgit.lib.PersonIdent import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class ItemArchiveManagerImpl( roRuleRepository: RoRuleRepository, @@ -654,7 +654,7 @@ object PartialArchive { val parameterArchive: PartialArchive = PartialArchive("parameters/") } -import com.normation.rudder.repository.xml.PartialArchive._ +import com.normation.rudder.repository.xml.PartialArchive.* case object TechniqueLibraryArchive extends ArchiveMode { def configureRm(rmCmd: RmCommand): RmCommand = directiveArchive.configureRm(ncfArchive.configureRm(rmCmd)) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ParseXml.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ParseXml.scala index f77d7af03d9..515f80b026b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ParseXml.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/ParseXml.scala @@ -37,13 +37,13 @@ package com.normation.rudder.repository.xml -import com.normation.errors._ +import com.normation.errors.* import java.io.InputStream import org.xml.sax.SAXParseException import scala.xml.Elem import scala.xml.XML -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* object ParseXml { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/RudderPrettyPrinter.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/RudderPrettyPrinter.scala index c6882526773..2dca4045298 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/RudderPrettyPrinter.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/RudderPrettyPrinter.scala @@ -26,7 +26,7 @@ package com.normation.rudder.repository.xml class RudderPrettyPrinter(width: Int, step: Int) { - import scala.xml._ + import scala.xml.* def sbToString(f: (StringBuilder) => Unit): String = { val sb = new StringBuilder @@ -137,7 +137,7 @@ class RudderPrettyPrinter(width: Int, step: Int) { protected def childrenAreLeaves(n: Node): Boolean = { def isLeaf(l: Node) = l match { - case _: Atom[_] | _: Comment | _: EntityRef | _: ProcInstr => true + case _: Atom[?] | _: Comment | _: EntityRef | _: ProcInstr => true case _ => false } n.child forall isLeaf @@ -152,7 +152,7 @@ class RudderPrettyPrinter(width: Int, step: Int) { case Text(s) if s.trim() == "" => ; - case _: Atom[_] | _: Comment | _: EntityRef | _: ProcInstr => + case _: Atom[?] | _: Comment | _: EntityRef | _: ProcInstr => makeBox(ind, node.toString.trim()) case g @ Group(xs) => traverse(xs.iterator, pscope, ind) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/XmlArchiverUtils.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/XmlArchiverUtils.scala index d306bd429de..816939e6021 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/XmlArchiverUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/XmlArchiverUtils.scala @@ -37,7 +37,7 @@ package com.normation.rudder.repository.xml -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.domain.logger.GitArchiveLogger import java.io.File import java.nio.charset.Charset @@ -70,10 +70,10 @@ trait XmlArchiverUtils { * Perms are defined in /opt/rudder/bin/rudder-fix-repository-configuration */ def writeXml(fileName: File, elem: Elem, logMessage: String): IOResult[File] = { - import better.files._ + import better.files.* - import java.nio.file.StandardOpenOption._ - import java.nio.file.attribute.PosixFilePermission._ + import java.nio.file.StandardOpenOption.* + import java.nio.file.attribute.PosixFilePermission.* val filePerms = Set[PosixFilePermission](OWNER_READ, OWNER_WRITE, /* no exec, */ GROUP_READ, GROUP_WRITE /* no exec, */ ) val directoryPerms = Set[PosixFilePermission](OWNER_READ, OWNER_WRITE, OWNER_EXECUTE, GROUP_READ, GROUP_WRITE, GROUP_EXECUTE) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/GitRuleCategoryArchiver.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/GitRuleCategoryArchiver.scala index a0c83149e0d..f62fd7c5a41 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/GitRuleCategoryArchiver.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/GitRuleCategoryArchiver.scala @@ -38,7 +38,7 @@ package com.normation.rudder.rule.category import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.ModificationId import com.normation.rudder.domain.Constants.RULE_CATEGORY_ARCHIVE_TAG import com.normation.rudder.git.GitArchiveId @@ -47,13 +47,13 @@ import com.normation.rudder.git.GitConfigItemRepository import com.normation.rudder.git.GitPath import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.repository.GitModificationRepository -import com.normation.rudder.repository.xml._ +import com.normation.rudder.repository.xml.* import com.normation.rudder.services.marshalling.RuleCategorySerialisation import java.io.File import org.apache.commons.io.FileUtils import org.eclipse.jgit.lib.PersonIdent import org.joda.time.DateTime -import zio._ +import zio.* trait GitRuleCategoryArchiver { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/ImportRuleCategoryLibrary.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/ImportRuleCategoryLibrary.scala index 6bb263671bf..0a524910547 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/ImportRuleCategoryLibrary.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/ImportRuleCategoryLibrary.scala @@ -37,17 +37,17 @@ package com.normation.rudder.rule.category -import cats.implicits._ -import com.normation.errors._ +import cats.implicits.* +import com.normation.errors.* import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.archives.RuleCategoryArchiveId -import com.normation.rudder.repository.ldap._ +import com.normation.rudder.repository.ldap.* import com.unboundid.ldap.sdk.DN import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import zio._ +import zio.* trait ImportRuleCategoryLibrary { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/LDAPRuleCategoryRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/LDAPRuleCategoryRepository.scala index 3aaffa00585..00ac8ef29a8 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/LDAPRuleCategoryRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/LDAPRuleCategoryRepository.scala @@ -37,28 +37,28 @@ package com.normation.rudder.rule.category -import cats.implicits._ +import cats.implicits.* import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.ldap.ldif.LDIFNoopChangeRecord -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.LDAPEntry import com.normation.ldap.sdk.RoLDAPConnection import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.repository.ldap.LDAPEntityMapper import com.normation.rudder.repository.ldap.ScalaReadWriteLock import com.normation.rudder.services.user.PersonIdentService import com.normation.utils.StringUuidGenerator import com.normation.utils.Utils import com.unboundid.ldap.sdk.DN -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * Here is the ordering for a List[RuleCategoryId] @@ -107,7 +107,7 @@ class RoLDAPRuleCategoryRepository( attributes: String* ): IOResult[Option[LDAPEntry]] = { categoryMutex.readLock { - con.searchSub(rudderDit.RULECATEGORY.dn, EQ(A_RULE_CATEGORY_UUID, id.value), attributes: _*) + con.searchSub(rudderDit.RULECATEGORY.dn, EQ(A_RULE_CATEGORY_UUID, id.value), attributes*) }.flatMap { categoryEntries => categoryEntries.size match { case 0 => None.succeed @@ -129,7 +129,7 @@ class RoLDAPRuleCategoryRepository( categoryMutex.readLock(for { con <- ldap - entries <- con.searchSub(rudderDit.RULECATEGORY.dn, IS(OC_RULE_CATEGORY), catAttributes: _*) + entries <- con.searchSub(rudderDit.RULECATEGORY.dn, IS(OC_RULE_CATEGORY), catAttributes*) // look for sub categories categories <- ZIO.foreach(entries) { entry => mapper @@ -175,7 +175,7 @@ class WoLDAPRuleCategoryRepository( ) extends WoRuleCategoryRepository with NamedZioLogger { repo => - import roruleCategoryRepo._ + import roruleCategoryRepo.* override def loggerName: String = this.getClass.getName diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategory.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategory.scala index 243b0d3ddce..f0af43df139 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategory.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategory.scala @@ -38,7 +38,7 @@ package com.normation.rudder.rule.category import com.normation.rudder.domain.policies.Rule -import net.liftweb.common._ +import net.liftweb.common.* import scala.annotation.nowarn /** diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategoryRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategoryRepository.scala index ca3b7d09f68..6075feaca5f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategoryRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/rule/category/RuleCategoryRepository.scala @@ -37,7 +37,7 @@ package com.normation.rudder.rule.category -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ComplianceScore.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ComplianceScore.scala index 9d54e9b3c66..14d5fef766f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ComplianceScore.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ComplianceScore.scala @@ -46,9 +46,9 @@ import com.normation.rudder.score.ScoreValue.B import com.normation.rudder.score.ScoreValue.C import com.normation.rudder.score.ScoreValue.D import com.normation.rudder.score.ScoreValue.E -import zio._ -import zio.json._ -import zio.syntax._ +import zio.* +import zio.json.* +import zio.syntax.* object ComplianceScore { val scoreId = "compliance" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/GlobalScoreRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/GlobalScoreRepository.scala index ede6b1b91c9..8a71c4703de 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/GlobalScoreRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/GlobalScoreRepository.scala @@ -40,11 +40,11 @@ package com.normation.rudder.score import com.normation.errors.IOResult import com.normation.inventory.domain.NodeId import com.normation.rudder.db.Doobie -import doobie.implicits._ +import doobie.implicits.* import doobie.implicits.toSqlInterpolator import doobie.postgres.implicits.pgEnumString import doobie.util.invariant.InvalidEnum -import zio.interop.catz._ +import zio.interop.catz.* trait GlobalScoreRepository { def getAll(): IOResult[Map[NodeId, GlobalScore]] @@ -55,9 +55,9 @@ trait GlobalScoreRepository { object GlobalScoreRepositoryImpl { - import ScoreSerializer._ - import com.normation.rudder.db.json.implicits._ - import doobie._ + import ScoreSerializer.* + import com.normation.rudder.db.json.implicits.* + import doobie.* implicit val scoreMeta: Meta[ScoreValue] = { def getValue(value: String) = { @@ -93,8 +93,8 @@ object GlobalScoreRepositoryImpl { } class GlobalScoreRepositoryImpl(doobie: Doobie) extends GlobalScoreRepository { - import GlobalScoreRepositoryImpl._ - import doobie._ + import GlobalScoreRepositoryImpl.* + import doobie.* def save(nodeId: NodeId, globalScore: GlobalScore): IOResult[(NodeId, GlobalScore)] = { val query = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/Score.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/Score.scala index 97e5deebda0..978318628bd 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/Score.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/Score.scala @@ -42,8 +42,8 @@ import com.normation.errors.PureResult import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.SoftwareUpdate import com.normation.rudder.domain.reports.CompliancePercent -import zio._ -import zio.json._ +import zio.* +import zio.json.* import zio.json.ast.Json sealed trait ScoreValue { @@ -78,7 +78,7 @@ object GlobalScoreService { case (newScore, acc) => NoDetailsScore(newScore.scoreId, newScore.value, newScore.message) :: acc.filterNot(_.scoreId == newScore.scoreId) } - import ScoreValue._ + import ScoreValue.* val score = if (correctScores.exists(_.value == E)) { E } else if (correctScores.exists(_.value == D)) { D } else if (correctScores.exists(_.value == C)) { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreRepository.scala index d9eb4dd5590..9bbbd364fa5 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreRepository.scala @@ -44,11 +44,11 @@ import doobie.Fragments import doobie.Meta import doobie.Read import doobie.Write -import doobie.implicits._ +import doobie.implicits.* import doobie.implicits.toSqlInterpolator import doobie.postgres.implicits.pgEnumString import doobie.util.invariant.InvalidEnum -import zio.interop.catz._ +import zio.interop.catz.* import zio.json.ast.Json trait ScoreRepository { @@ -63,7 +63,7 @@ trait ScoreRepository { class ScoreRepositoryImpl(doobie: Doobie) extends ScoreRepository { - import com.normation.rudder.db.json.implicits._ + import com.normation.rudder.db.json.implicits.* implicit val scoreMeta: Meta[ScoreValue] = { def getValue(value: String) = { @@ -93,7 +93,7 @@ class ScoreRepositoryImpl(doobie: Doobie) extends ScoreRepository { } } - import doobie._ + import doobie.* override def getAll(): IOResult[Map[NodeId, List[Score]]] = { val q = sql"select nodeId, scoreId, score, message, details from scoreDetails " transactIOResult(s"error when getting scores for node")(xa => q.query[(NodeId, Score)].to[List].transact(xa)) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreService.scala index 98c3bf0fd17..ace365596ba 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/ScoreService.scala @@ -40,8 +40,8 @@ package com.normation.rudder.score import com.normation.errors.IOResult import com.normation.inventory.domain.InventoryError.Inconsistency import com.normation.inventory.domain.NodeId -import com.normation.zio._ -import zio._ +import com.normation.zio.* +import zio.* import zio.syntax.ToZio trait ScoreService { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/SystemUpdateScore.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/SystemUpdateScore.scala index 67e1bb0385c..ecae6bff956 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/SystemUpdateScore.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/score/SystemUpdateScore.scala @@ -50,9 +50,9 @@ import com.normation.rudder.score.ScoreValue.B import com.normation.rudder.score.ScoreValue.C import com.normation.rudder.score.ScoreValue.D import com.normation.rudder.score.ScoreValue.E -import zio._ -import zio.json._ -import zio.syntax._ +import zio.* +import zio.json.* +import zio.syntax.* object SystemUpdateScore { val scoreId = "system-updates" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/ClearCacheService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/ClearCacheService.scala index 6de53a9f41e..d82293576a3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/ClearCacheService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/ClearCacheService.scala @@ -1,6 +1,6 @@ package com.normation.rudder.services -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.EventActor import com.normation.eventlog.EventLog import com.normation.eventlog.EventLogDetails @@ -13,7 +13,7 @@ import com.normation.rudder.repository.CachedRepository import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.services.policies.nodeconfig.NodeConfigurationHashRepository import com.normation.utils.StringUuidGenerator -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Box import net.liftweb.common.EmptyBox import net.liftweb.common.Full diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/ChangeRequestEventLogService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/ChangeRequestEventLogService.scala index 2a3d57c5ebd..1f58b037a22 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/ChangeRequestEventLogService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/ChangeRequestEventLogService.scala @@ -37,14 +37,14 @@ package com.normation.rudder.services.eventlog -import com.normation.box._ -import com.normation.eventlog._ +import com.normation.box.* +import com.normation.eventlog.* import com.normation.rudder.domain.eventlog.ChangeRequestDiff import com.normation.rudder.domain.eventlog.ChangeRequestEventLog import com.normation.rudder.domain.eventlog.ChangeRequestLogsFilter import com.normation.rudder.domain.workflows.ChangeRequestId import com.normation.rudder.repository.EventLogRepository -import net.liftweb.common._ +import net.liftweb.common.* /** * Allow to query relevant information about change request diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala index 1d5451afa30..d3abfe5ae24 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala @@ -38,7 +38,7 @@ package com.normation.rudder.services.eventlog import com.normation.GitVersion.ParseRev -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion @@ -48,14 +48,14 @@ import com.normation.inventory.domain.KeyStatus import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.PublicKey import com.normation.inventory.domain.SecurityToken -import com.normation.rudder.api._ +import com.normation.rudder.api.* import com.normation.rudder.batch.CurrentDeploymentStatus -import com.normation.rudder.domain.Constants._ +import com.normation.rudder.domain.Constants.* import com.normation.rudder.domain.appconfig.RudderWebProperty import com.normation.rudder.domain.appconfig.RudderWebPropertyName -import com.normation.rudder.domain.eventlog._ -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.eventlog.* +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.AddGlobalParameterDiff import com.normation.rudder.domain.properties.DeleteGlobalParameterDiff import com.normation.rudder.domain.properties.GenericProperty @@ -66,24 +66,24 @@ import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.domain.properties.PropertyProvider import com.normation.rudder.domain.queries.Query import com.normation.rudder.domain.secret.Secret -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.git.GitArchiveId import com.normation.rudder.git.GitCommitId import com.normation.rudder.git.GitPath -import com.normation.rudder.reports._ +import com.normation.rudder.reports.* import com.normation.rudder.rule.category.RuleCategoryId -import com.normation.rudder.services.marshalling._ +import com.normation.rudder.services.marshalling.* import com.normation.rudder.services.marshalling.TestFileFormat import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.utils.Control.traverse import com.typesafe.config.ConfigValue -import net.liftweb.common._ -import net.liftweb.common.Box._ +import net.liftweb.common.* +import net.liftweb.common.Box.* import net.liftweb.util.Helpers.tryo import org.eclipse.jgit.lib.PersonIdent import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import scala.xml._ +import scala.xml.* /** * A service that helps mapping event log details to there structured data model. @@ -888,7 +888,7 @@ class EventLogDetailsServiceImpl( } def getApiAccountModifyDetails(xml: NodeSeq): Box[ModifyApiAccountDiff] = { - import cats.implicits._ + import cats.implicits.* for { entry <- getEntryContent(xml) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala index 5caa3a56b0d..dd0fdca60f6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala @@ -40,14 +40,14 @@ package com.normation.rudder.services.eventlog import com.normation.GitVersion import com.normation.cfclerk.domain.SectionSpec import com.normation.cfclerk.domain.TechniqueVersion -import com.normation.eventlog._ +import com.normation.eventlog.* import com.normation.inventory.domain.NodeId -import com.normation.rudder.api._ +import com.normation.rudder.api.* import com.normation.rudder.domain.Constants import com.normation.rudder.domain.appconfig.RudderWebProperty -import com.normation.rudder.domain.eventlog._ -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.eventlog.* +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.AddGlobalParameterDiff import com.normation.rudder.domain.properties.DeleteGlobalParameterDiff import com.normation.rudder.domain.properties.GenericProperty @@ -56,11 +56,11 @@ import com.normation.rudder.domain.properties.ModifyGlobalParameterDiff import com.normation.rudder.domain.queries.Query import com.normation.rudder.domain.secret.Secret import com.normation.rudder.domain.workflows.WorkflowStepChange -import com.normation.rudder.services.marshalling._ -import net.liftweb.util.Helpers._ +import com.normation.rudder.services.marshalling.* +import net.liftweb.util.Helpers.* import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import scala.xml._ +import scala.xml.* import scala.xml.Text trait EventLogFactory { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogServiceImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogServiceImpl.scala index b4038f16dec..09c304e27f8 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogServiceImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogServiceImpl.scala @@ -37,17 +37,17 @@ package com.normation.rudder.services.eventlog -import cats.data._ -import com.normation.box._ +import cats.data.* +import com.normation.box.* import com.normation.errors -import com.normation.eventlog._ +import com.normation.eventlog.* import com.normation.rudder.batch.CurrentDeploymentStatus -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.repository.EventLogRepository -import doobie._ -import doobie.implicits._ -import net.liftweb.common._ -import zio.syntax._ +import doobie.* +import doobie.implicits.* +import net.liftweb.common.* +import zio.syntax.* class EventLogDeploymentService( val repository: EventLogRepository, @@ -94,7 +94,7 @@ class EventLogDeploymentService( case Nil => Nil.succeed case h :: t => val query = - Fragments.and(Fragments.in(fr"eventtype", NonEmptyList.of(h, t: _*)), fr" id > ${lastSuccess.id.getOrElse(0)}") + Fragments.and(Fragments.in(fr"eventtype", NonEmptyList.of(h, t*)), fr" id > ${lastSuccess.id.getOrElse(0)}") repository.getEventLogByCriteria(Some(query), None, List(Fragment.const("id DESC")), None) } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/InventoryEventLogServiceImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/InventoryEventLogServiceImpl.scala index 54b5b40ccf5..68993613968 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/InventoryEventLogServiceImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/InventoryEventLogServiceImpl.scala @@ -37,11 +37,11 @@ package com.normation.rudder.services.eventlog -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.domain.eventlog.InventoryEventLog import com.normation.rudder.repository.EventLogRepository -import doobie._ -import net.liftweb.common._ +import doobie.* +import net.liftweb.common.* class InventoryEventLogServiceImpl( repository: EventLogRepository diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/SecretEventLogService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/SecretEventLogService.scala index 45aeffd9c88..8994128d334 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/SecretEventLogService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/SecretEventLogService.scala @@ -37,11 +37,11 @@ package com.normation.rudder.services.eventlog -import com.normation.box._ -import com.normation.eventlog._ +import com.normation.box.* +import com.normation.eventlog.* import com.normation.rudder.domain.secret.Secret import com.normation.rudder.repository.EventLogRepository -import net.liftweb.common._ +import net.liftweb.common.* /** * Allow to query relevant information about change request diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/WorkflowEventLogService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/WorkflowEventLogService.scala index 9926a74ccd0..bed72b2db6d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/WorkflowEventLogService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/WorkflowEventLogService.scala @@ -36,13 +36,13 @@ */ package com.normation.rudder.services.eventlog -import com.normation.box._ -import com.normation.eventlog._ -import com.normation.rudder.domain.eventlog._ -import com.normation.rudder.domain.workflows._ +import com.normation.box.* +import com.normation.eventlog.* +import com.normation.rudder.domain.eventlog.* +import com.normation.rudder.domain.workflows.* import com.normation.rudder.repository.EventLogRepository import com.normation.utils.StringUuidGenerator -import net.liftweb.common._ +import net.liftweb.common.* trait WorkflowEventLogService { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckNotificationService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckNotificationService.scala index 9725e0a814f..3557c918dd4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckNotificationService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckNotificationService.scala @@ -35,9 +35,9 @@ */ package com.normation.rudder.services.healthcheck -import com.normation.zio._ +import com.normation.zio.* import scala.annotation.nowarn -import zio._ +import zio.* import zio.Ref class HealthcheckNotificationService( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckService.scala index 5e0d91c3e5a..d7dd203e407 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckService.scala @@ -3,7 +3,7 @@ package com.normation.rudder.services.healthcheck import better.files.File.root import com.normation.errors.Inconsistency import com.normation.errors.IOResult -import com.normation.rudder.domain.logger.{HealthcheckLoggerPure => logger} +import com.normation.rudder.domain.logger.HealthcheckLoggerPure as logger import com.normation.rudder.facts.nodes.NodeFactRepository import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.hooks.Cmd diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/MarshallingUtil.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/MarshallingUtil.scala index 03a5b92d189..065193d7791 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/MarshallingUtil.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/MarshallingUtil.scala @@ -37,12 +37,12 @@ package com.normation.rudder.services.marshalling -import scala.xml._ +import scala.xml.* object MarshallingUtil { def createElem(label: String, fileFormat: String)(children: NodeSeq): Elem = { - Elem(null, label, new UnprefixedAttribute("fileFormat", fileFormat, Null), TopScope, false, children: _*) + Elem(null, label, new UnprefixedAttribute("fileFormat", fileFormat, Null), TopScope, false, children*) } def createTrimedElem(label: String, fileFormat: String)(children: NodeSeq): Elem = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/TestFileFormat.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/TestFileFormat.scala index 0eff395d189..bee3a721bd6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/TestFileFormat.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/TestFileFormat.scala @@ -38,7 +38,7 @@ package com.normation.rudder.services.marshalling import com.normation.rudder.domain.Constants -import net.liftweb.common._ +import net.liftweb.common.* import scala.xml.Node object TestFileFormat { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala index b69dad6058b..ca255e8410e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala @@ -49,9 +49,9 @@ import com.normation.rudder.api.ApiAuthorization import com.normation.rudder.batch.CurrentDeploymentStatus import com.normation.rudder.batch.ErrorStatus import com.normation.rudder.batch.SuccessStatus -import com.normation.rudder.domain.Constants._ +import com.normation.rudder.domain.Constants.* import com.normation.rudder.domain.appconfig.RudderWebProperty -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.policies.ActiveTechnique import com.normation.rudder.domain.policies.ActiveTechniqueCategory import com.normation.rudder.domain.policies.AddDirectiveDiff @@ -74,14 +74,14 @@ import com.normation.rudder.domain.properties.DeleteGlobalParameterDiff import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.properties.ModifyToGlobalParameterDiff import com.normation.rudder.domain.secret.Secret -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.domain.workflows.ChangeRequest import com.normation.rudder.domain.workflows.ConfigurationChangeRequest import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.services.marshalling.MarshallingUtil.createTrimedElem -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.format.ISODateTimeFormat -import scala.xml.{Node => XNode, _} +import scala.xml.{Node as XNode, *} import scala.xml.NodeSeq //serialize / deserialize tags diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisation.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisation.scala index 027e3f258e5..9ff97d80124 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisation.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisation.scala @@ -52,10 +52,10 @@ import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.policies.SectionVal import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.secret.Secret -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.rule.category.RuleCategory import net.liftweb.common.Box -import scala.xml.{Node => XNode} +import scala.xml.Node as XNode import scala.xml.NodeSeq trait XmlUnserializer { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala index 3a48c065f2b..24921684cda 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala @@ -39,7 +39,7 @@ package com.normation.rudder.services.marshalling import com.normation.GitVersion import com.normation.GitVersion.ParseRev -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion @@ -47,14 +47,14 @@ import com.normation.cfclerk.services.TechniqueRepository import com.normation.cfclerk.xmlparsers.SectionSpecParser import com.normation.eventlog.EventActor import com.normation.inventory.domain.NodeId -import com.normation.rudder.api._ +import com.normation.rudder.api.* import com.normation.rudder.batch.CurrentDeploymentStatus import com.normation.rudder.batch.ErrorStatus import com.normation.rudder.batch.NoStatus import com.normation.rudder.batch.SuccessStatus -import com.normation.rudder.domain.Constants._ -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.Constants.* +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.policies.ActiveTechnique import com.normation.rudder.domain.policies.ActiveTechniqueCategory import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId @@ -74,7 +74,7 @@ import com.normation.rudder.domain.properties.InheritMode import com.normation.rudder.domain.properties.ModifyToGlobalParameterDiff import com.normation.rudder.domain.properties.PropertyProvider import com.normation.rudder.domain.secret.Secret -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.domain.workflows.DirectiveChangeItem import com.normation.rudder.domain.workflows.DirectiveChanges import com.normation.rudder.domain.workflows.NodeGroupChanges @@ -83,17 +83,17 @@ import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.rule.category.RuleCategoryId import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.utils.Control.traverse -import net.liftweb.common._ -import net.liftweb.common.Box._ +import net.liftweb.common.* +import net.liftweb.common.Box.* import net.liftweb.common.Failure import net.liftweb.util.Helpers.tryo import org.apache.commons.lang3.StringEscapeUtils import org.joda.time.format.ISODateTimeFormat import scala.annotation.nowarn -import scala.util.{Failure => Catch} +import scala.util.Failure as Catch import scala.util.Success import scala.util.Try -import scala.xml.{Node => XNode} +import scala.xml.Node as XNode import scala.xml.NodeSeq import scala.xml.Text @@ -287,7 +287,7 @@ class NodeGroupUnserialisationImpl( ) .toBox } - case xml => Failure(s"Found unexpected xml under tag: ${xml}") + case xml => Failure(s"Found unexpected xml under tag: ${xml}") } } yield { NodeGroup( @@ -787,7 +787,7 @@ class ApiAccountUnserialisationImpl extends ApiAccountUnserialisation { private def unserAcl(entry: XNode): Box[ApiAuthorization.ACL] = { // at that point, any error is an grave error: we don't want to // mess up with authz - import cats.implicits._ + import cats.implicits.* val authzs = traverse(entry \\ "authz") { e => for { @@ -848,14 +848,14 @@ class ApiAccountUnserialisationImpl extends ApiAccountUnserialisation { // because the event was saved < Rudder 4.3. Use a "nil" ACL Full(ApiAuthorization.None) - case Some(Text(ApiAuthorizationKind.RO.name)) => + case Some(Text(ApiAuthorizationKind.RO.name)) => Full(ApiAuthorization.RO) - case Some(Text(ApiAuthorizationKind.RW.name)) => + case Some(Text(ApiAuthorizationKind.RW.name)) => Full(ApiAuthorization.RW) case Some({xml @ _*}) if (xml.nonEmpty) => unserAcl(xml.head) // all other case: serialization pb => None - case _ => Full(ApiAuthorization.None) + case _ => Full(ApiAuthorization.None) } accountType = (apiAccount \ "kind").headOption.map(_.text) match { case None => ApiAccountType.PublicApi diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/DiffService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/DiffService.scala index 6ba41d21334..2c3cf7d26d8 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/DiffService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/DiffService.scala @@ -42,7 +42,7 @@ import com.normation.cfclerk.domain.TechniqueName import com.normation.rudder.domain.logger.ChangeRequestLogger import com.normation.rudder.domain.nodes.ModifyNodeGroupDiff import com.normation.rudder.domain.nodes.NodeGroup -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.properties.ModifyGlobalParameterDiff @@ -84,7 +84,7 @@ class DiffServiceImpl extends DiffService { newRootSection: Option[SectionSpec], techniqueName: TechniqueName ): ModifyDirectiveDiff = { - import com.normation.rudder.domain.policies.SectionVal._ + import com.normation.rudder.domain.policies.SectionVal.* def toDirectiveDiff[T]: (Directive => T) => Option[SimpleDiff[T]] = toDiff[Directive, T](reference, newItem) _ val refSectionVal = refRootSection.map(directiveValToSectionVal(_, reference.parameters)) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/ModificationService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/ModificationService.scala index 2a77a433c1d..10af34e78e1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/ModificationService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/modification/ModificationService.scala @@ -37,13 +37,13 @@ package com.normation.rudder.services.modification -import com.normation.box._ -import com.normation.eventlog._ +import com.normation.box.* +import com.normation.eventlog.* import com.normation.rudder.git.GitCommitId -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.repository.EventLogRepository import com.normation.utils.StringUuidGenerator -import net.liftweb.common._ +import net.liftweb.common.* import org.eclipse.jgit.lib.PersonIdent class ModificationService( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/MergeNodeProperties.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/MergeNodeProperties.scala index 344d0243655..768d26b93f4 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/MergeNodeProperties.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/MergeNodeProperties.scala @@ -37,9 +37,9 @@ package com.normation.rudder.services.nodes -import cats.implicits._ +import cats.implicits.* import com.normation.GitVersion -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupId @@ -56,9 +56,9 @@ import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.domain.properties.NodePropertyHierarchy import com.normation.rudder.domain.properties.ParentProperty import com.normation.rudder.domain.properties.PropertyProvider -import com.normation.rudder.domain.queries._ -import com.normation.rudder.services.nodes.GroupProp._ -import com.softwaremill.quicklens._ +import com.normation.rudder.domain.queries.* +import com.normation.rudder.services.nodes.GroupProp.* +import com.softwaremill.quicklens.* import com.typesafe.config.ConfigParseOptions import com.typesafe.config.ConfigRenderOptions import org.jgrapht.alg.connectivity.ConnectivityInspector @@ -66,7 +66,7 @@ import org.jgrapht.graph.AsSubgraph import org.jgrapht.graph.DefaultDirectedGraph import org.jgrapht.graph.DefaultEdge import org.jgrapht.traverse.TopologicalOrderIterator -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* /** * This file handle how node properties are merged with other (global, groups, etc) @@ -237,7 +237,7 @@ object MergeNodeProperties { allGroups: Map[NodeGroupId, FullGroupTarget], acc: Map[NodeGroupId, FullGroupTarget] ): PureResult[Map[NodeGroupId, FullGroupTarget]] = { - import cats.implicits._ + import cats.implicits.* currents match { case Nil => Right(acc) case list => @@ -248,7 +248,7 @@ object MergeNodeProperties { case Right(acc) => if (acc.isDefinedAt(g.nodeGroup.id)) Right(acc) // already done previously else { - import com.normation.rudder.services.nodes.GroupProp._ + import com.normation.rudder.services.nodes.GroupProp.* for { prop <- g.nodeGroup.toGroupProp parents <- prop.parentGroups.traverse { parentId => diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala index 5ddf9c06e98..36d6519d665 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala @@ -42,7 +42,7 @@ import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.inventory.domain.AcceptedInventory import com.normation.inventory.domain.NodeId -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.rudder.domain.logger.NodeLoggerPure import com.normation.rudder.domain.queries.CriterionLine import com.normation.rudder.domain.queries.DitQueryData @@ -62,10 +62,10 @@ import com.normation.rudder.hooks.RunHooks import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.WoNodeGroupRepository import com.normation.rudder.services.queries.QueryProcessor -import com.normation.zio._ -import com.softwaremill.quicklens._ -import zio.{System => _, _} -import zio.syntax._ +import com.normation.zio.* +import com.softwaremill.quicklens.* +import zio.{System as _, *} +import zio.syntax.* /** * A newNodeManager hook is a class that accept callbacks. @@ -139,8 +139,8 @@ class PostNodeAcceptanceHookScripts( override def run(nodeId: NodeId)(implicit qc: QueryContext): IOResult[Unit] = { val systemEnv = { - import scala.jdk.CollectionConverters._ - HookEnvPairs.build(System.getenv.asScala.toSeq: _*) + import scala.jdk.CollectionConverters.* + HookEnvPairs.build(System.getenv.asScala.toSeq*) } HooksLogger.debug(s"Executing post-node-acceptance hooks for node with id '${nodeId.value}'") diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala index 6988bf81159..ff71e84eaf9 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala @@ -38,10 +38,10 @@ package com.normation.rudder.services.nodes import com.normation.errors.IOResult -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.nodes.Node import com.normation.rudder.domain.nodes.NodeInfo import org.joda.time.DateTime diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PropertyEngineService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PropertyEngineService.scala index b12435a9737..e0051c72328 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PropertyEngineService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PropertyEngineService.scala @@ -1,7 +1,7 @@ package com.normation.rudder.services.nodes -import com.normation.errors._ -import com.normation.zio._ +import com.normation.errors.* +import com.normation.zio.* import zio.Ref final case class EngineOption(name: String, value: String) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PurgeDeletedNodes.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PurgeDeletedNodes.scala index f8f7a9dda6e..a32c9076e2f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PurgeDeletedNodes.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/PurgeDeletedNodes.scala @@ -36,18 +36,18 @@ */ package com.normation.rudder.services.servers -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.RemovedInventory import com.normation.inventory.ldap.core.InventoryDit -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.inventory.ldap.core.LDAPFullInventoryRepository -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* import com.normation.rudder.domain.logger.NodeLoggerPure import com.normation.rudder.services.nodes.NodeInfoService.A_MOD_TIMESTAMP import org.joda.time.DateTime -import zio.{System => _, _} +import zio.{System as _, *} trait PurgeDeletedNodes { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala index be5e6d986d2..74aa603a49e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/RemoveNodeService.scala @@ -36,8 +36,8 @@ */ package com.normation.rudder.services.servers -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.eventlog.ModificationId import com.normation.inventory.domain.AcceptedInventory import com.normation.inventory.domain.AgentType @@ -47,13 +47,13 @@ import com.normation.inventory.domain.PendingInventory import com.normation.inventory.domain.RemovedInventory import com.normation.inventory.domain.UndefinedKey import com.normation.inventory.ldap.core.InventoryDit -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.inventory.ldap.core.LDAPFullInventoryRepository -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* import com.normation.rudder.domain.Constants import com.normation.rudder.domain.NodeDit -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.domain.logger.NodeLoggerPure import com.normation.rudder.facts.nodes.ChangeContext @@ -70,9 +70,9 @@ import com.normation.rudder.repository.WoNodeGroupRepository import com.normation.rudder.repository.ldap.ScalaReadWriteLock import com.normation.rudder.services.policies.write.NodePoliciesPaths import com.normation.rudder.services.policies.write.PathComputer -import com.normation.rudder.services.servers.DeletionResult._ +import com.normation.rudder.services.servers.DeletionResult.* import com.normation.utils.StringUuidGenerator -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.Modification import com.unboundid.ldap.sdk.ModificationType import com.unboundid.ldif.LDIFChangeRecord @@ -83,9 +83,9 @@ import java.nio.file.attribute.BasicFileAttributes import java.util.function.BiPredicate import java.util.function.Consumer import net.liftweb.common.Box -import zio.{System => _, _} -import zio.stream._ -import zio.syntax._ +import zio.{System as _, *} +import zio.stream.* +import zio.syntax.* sealed trait DeletionResult object DeletionResult { @@ -141,7 +141,7 @@ object PostNodeDeleteAction { } } } -import PostNodeDeleteAction._ +import PostNodeDeleteAction.* trait RemoveNodeService { @@ -359,7 +359,7 @@ class RemoveNodeServiceImpl( x => Some(x).succeed ) } yield { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* ( HookEnvPairs.build( ("RUDDER_NODE_ID", nodeInfo.id.value), @@ -371,7 +371,7 @@ class RemoveNodeServiceImpl( ("RUDDER_POLICIES_DIRECTORY_NEW", optNodePaths.map(_.newFolder).getOrElse("")), ("RUDDER_POLICIES_DIRECTORY_ARCHIVE", optNodePaths.flatMap(_.backupFolder).getOrElse("")) ), - HookEnvPairs.build(System.getenv.asScala.toSeq: _*) + HookEnvPairs.build(System.getenv.asScala.toSeq*) ) } } @@ -632,8 +632,8 @@ class CleanUpCFKeys extends PostNodeDeleteAction { // clean-up node files on FS class CleanUpNodePolicyFiles(varRudderShare: String) extends PostNodeDeleteAction { - import better.files._ - import better.files.File._ + import better.files.* + import better.files.File.* override def run( nodeId: NodeId, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/HistoryLogRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/HistoryLogRepository.scala index 86deea3b826..e064de05676 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/HistoryLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/HistoryLogRepository.scala @@ -20,7 +20,7 @@ package com.normation.rudder.services.nodes.history -import com.normation.errors._ +import com.normation.errors.* import org.joda.time.DateTime trait WriteOnlyHistoryLogRepository[ID, V, T, HLog <: HistoryLog[ID, V, T]] { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala index f71e1c1cb86..048ade2f6f1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/FileHistoryLogRepository.scala @@ -20,16 +20,16 @@ package com.normation.rudder.services.nodes.history.impl -import FileHistoryLogRepository._ -import com.normation.errors._ +import FileHistoryLogRepository.* +import com.normation.errors.* import com.normation.inventory.domain.InventoryError import com.normation.rudder.services.nodes.history.HistoryLogRepository import java.io.File import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat import scala.reflect.ClassTag -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * A trait that allows to write and read datas of type T diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryJdbcRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryJdbcRepository.scala index 7dc7575f657..ce22132bda1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryJdbcRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryJdbcRepository.scala @@ -20,7 +20,7 @@ package com.normation.rudder.services.nodes.history.impl -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.inventory.domain.AcceptedInventory import com.normation.inventory.domain.InventoryStatus @@ -30,15 +30,15 @@ import com.normation.rudder.facts.nodes.NodeFact import com.normation.rudder.services.nodes.history.HistoryLog import com.normation.rudder.services.nodes.history.HistoryLogRepository import com.normation.utils.DateFormaterService -import com.normation.utils.DateFormaterService.json._ +import com.normation.utils.DateFormaterService.json.* import doobie.Meta import doobie.Read import doobie.Write -import doobie.implicits._ +import doobie.implicits.* import doobie.implicits.toSqlInterpolator import org.joda.time.DateTime -import zio.interop.catz._ -import zio.json._ +import zio.interop.catz.* +import zio.json.* /* * Store inventory information about a node for when it is accepted/refused. @@ -89,9 +89,9 @@ class InventoryHistoryJdbcRepository( ) extends HistoryLogRepository[NodeId, DateTime, FactLogData, FactLog] with InventoryHistoryDelete { import com.normation.rudder.db.Doobie.DateTimeMeta - import com.normation.rudder.db.json.implicits._ - import com.normation.rudder.facts.nodes.NodeFactSerialisation._ - import doobie._ + import com.normation.rudder.db.json.implicits.* + import com.normation.rudder.facts.nodes.NodeFactSerialisation.* + import doobie.* implicit val nodeAcceptRefuseEventaMeta: Meta[NodeAcceptRefuseEvent] = new Meta(pgDecoderGet, pgEncoderPut) implicit val nodeDeleteEventaMeta: Meta[NodeDeleteEvent] = new Meta(pgDecoderGet, pgEncoderPut) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala index 30ec917fdc4..fa4ce76616b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/history/impl/InventoryHistoryLogRepository.scala @@ -37,16 +37,16 @@ package com.normation.rudder.services.nodes.history.impl -import com.normation.errors._ -import com.normation.inventory.domain._ +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.inventory.ldap.core.FullInventoryFromLdapEntries import com.normation.inventory.ldap.core.InventoryMapper import com.normation.ldap.sdk.LDAPEntry import com.unboundid.ldap.sdk.Entry -import com.unboundid.ldif._ +import com.unboundid.ldif.* import java.io.File import java.io.FileNotFoundException -import zio._ +import zio.* /** * A service that write and read ServerAndMachine inventory data to/from file. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala index 62c0fa2877c..4499579d793 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DataStructures.scala @@ -51,7 +51,7 @@ import com.normation.cfclerk.domain.TrackerVariable import com.normation.cfclerk.domain.TrackerVariableSpec import com.normation.cfclerk.domain.Variable import com.normation.cfclerk.domain.VariableSpec -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.PolicyGenerationLogger @@ -191,7 +191,7 @@ object InterpolationContext { // should not be evaluated depth: Int = 0 - ) = new InterpolationContext(nodeInfo, policyServerInfo, globalPolicyMode, TreeMap(nodeContext.toSeq: _*), parameters, depth) + ) = new InterpolationContext(nodeInfo, policyServerInfo, globalPolicyMode, TreeMap(nodeContext.toSeq*), parameters, depth) } final case class ParameterForConfiguration( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DependencyAndDeletionService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DependencyAndDeletionService.scala index 862f6035016..e0297cc6a17 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DependencyAndDeletionService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DependencyAndDeletionService.scala @@ -38,16 +38,16 @@ package com.normation.rudder.services.policies import com.normation.NamedZioLogger -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.ldap.sdk.BuildFilter.* import com.normation.ldap.sdk.LDAPConnectionProvider -import com.normation.ldap.sdk.LDAPIOResult._ +import com.normation.ldap.sdk.LDAPIOResult.* import com.normation.ldap.sdk.RoLDAPConnection import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.policies.ActiveTechniqueId import com.normation.rudder.domain.policies.CompositeRuleTarget import com.normation.rudder.domain.policies.Directive @@ -57,11 +57,11 @@ import com.normation.rudder.domain.policies.GroupTarget import com.normation.rudder.domain.policies.Rule import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.policies.RuleTarget -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.repository.ldap.LDAPEntityMapper -import net.liftweb.common._ -import zio._ -import zio.syntax._ +import net.liftweb.common.* +import zio.* +import zio.syntax.* /** * A container for items which depend on directives diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala index ccb0c507214..a8ac6a380d1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala @@ -39,12 +39,12 @@ package com.normation.rudder.services.policies import better.files.File import cats.data.NonEmptyList -import cats.implicits._ -import com.normation.box._ +import cats.implicits.* +import com.normation.box.* import com.normation.cfclerk.domain.ReportingLogic.FocusReport import com.normation.cfclerk.domain.SectionSpec import com.normation.cfclerk.domain.TechniqueName -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AixOS import com.normation.inventory.domain.MemorySize import com.normation.inventory.domain.NodeId @@ -58,9 +58,9 @@ import com.normation.rudder.domain.logger.PolicyGenerationLoggerPure import com.normation.rudder.domain.logger.TimingDebugLogger import com.normation.rudder.domain.nodes.NodeInfo import com.normation.rudder.domain.nodes.NodeState -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.properties._ -import com.normation.rudder.domain.properties.GenericProperty._ +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.properties.* +import com.normation.rudder.domain.properties.GenericProperty.* import com.normation.rudder.domain.reports.BlockExpectedReport import com.normation.rudder.domain.reports.ComponentExpectedReport import com.normation.rudder.domain.reports.DirectiveExpectedReports @@ -85,7 +85,7 @@ import com.normation.rudder.reports.ComplianceMode import com.normation.rudder.reports.ComplianceModeService import com.normation.rudder.reports.GlobalComplianceMode import com.normation.rudder.reports.HeartbeatConfiguration -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.services.nodes.MergeNodeProperties import com.normation.rudder.services.policies.nodeconfig.FileBasedNodeConfigurationHashRepository import com.normation.rudder.services.policies.nodeconfig.NodeConfigurationHash @@ -95,11 +95,11 @@ import com.normation.rudder.services.reports.CachedFindRuleNodeStatusReports import com.normation.rudder.services.reports.CachedNodeConfigurationService import com.normation.rudder.services.reports.CacheExpectedReportAction import com.normation.rudder.utils.ParseMaxParallelism -import com.normation.utils.Control._ -import com.softwaremill.quicklens._ +import com.normation.utils.Control.* +import com.softwaremill.quicklens.* import java.nio.charset.StandardCharsets import java.util.concurrent.TimeUnit -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.json.JsonAST.JArray import net.liftweb.json.JsonAST.JObject import net.liftweb.json.JsonAST.JString @@ -111,8 +111,8 @@ import org.joda.time.format.PeriodFormatterBuilder import scala.collection.MapView import scala.collection.immutable.Map import scala.concurrent.duration.FiniteDuration -import zio.{System => _, _} -import zio.syntax._ +import zio.{System as _, *} +import zio.syntax.* /** * A deployment hook is a class that accept callbacks. @@ -164,8 +164,8 @@ trait PromiseGenerationService { val rootNodeId = Constants.ROOT_POLICY_SERVER_ID // we need to add the current environment variables to the script context // plus the script environment variables used as script parameters - import scala.jdk.CollectionConverters._ - val systemEnv = HookEnvPairs.build(System.getenv.asScala.toSeq: _*) + import scala.jdk.CollectionConverters.* + val systemEnv = HookEnvPairs.build(System.getenv.asScala.toSeq*) /* * The computation of dynamic group is a workaround inconsistencies after importing definition @@ -2092,7 +2092,7 @@ trait PromiseGeneration_Hooks extends PromiseGenerationService with PromiseGener } _ <- RunHooks.asyncRun( postHooks, - HookEnvPairs.build(envParams: _*), + HookEnvPairs.build(envParams*), systemEnv ) @@ -2156,7 +2156,7 @@ trait PromiseGeneration_Hooks extends PromiseGenerationService with PromiseGener :: Nil) _ <- RunHooks.asyncRun( failureHooks, - HookEnvPairs.build(envParams: _*), + HookEnvPairs.build(envParams*), systemEnv ) } yield () diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala index 480abc4c85f..f69b99bb0b6 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala @@ -37,19 +37,19 @@ package com.normation.rudder.services.policies -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.rudder.domain.policies.PolicyModeOverrides import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.services.nodes.EngineOption import com.normation.rudder.services.nodes.PropertyEngineService -import com.normation.rudder.services.policies.PropertyParserTokens._ +import com.normation.rudder.services.policies.PropertyParserTokens.* import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigValue -import net.liftweb.common._ -import zio._ -import zio.syntax._ +import net.liftweb.common.* +import zio.* +import zio.syntax.* /** * A parser that handle parameterized value of @@ -483,8 +483,8 @@ class InterpolatedValueCompilerImpl(p: PropertyEngineService) extends Interpolat object PropertyParser { - import fastparse._ - import fastparse.NoWhitespace._ + import fastparse.* + import fastparse.NoWhitespace.* def parse(value: String): PureResult[List[Token]] = { (fastparse.parse(value, all(_)): @unchecked) match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala index 8ac4cb74a95..88ff022d43c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala @@ -40,16 +40,16 @@ package com.normation.rudder.services.policies import ca.mrvisser.sealerate import com.normation.cfclerk.domain.AbstactPassword import com.normation.cfclerk.domain.AixPasswordHashAlgo -import com.normation.cfclerk.domain.HashAlgoConstraint._ +import com.normation.cfclerk.domain.HashAlgoConstraint.* import com.normation.cfclerk.domain.Variable -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.domain.appconfig.FeatureSwitch import com.normation.rudder.domain.logger.JsDirectiveParamLogger import com.normation.rudder.domain.logger.JsDirectiveParamLoggerPure -import com.normation.rudder.services.policies.HashOsType._ -import com.normation.rudder.services.policies.JsEngine._ +import com.normation.rudder.services.policies.HashOsType.* +import com.normation.rudder.services.policies.JsEngine.* import java.security.NoSuchAlgorithmException -import java.util.concurrent._ +import java.util.concurrent.* import java.util.concurrent.Callable import java.util.concurrent.Executors import java.util.concurrent.TimeoutException @@ -63,8 +63,8 @@ import org.graalvm.polyglot.io.IOAccess import org.graalvm.polyglot.proxy.ProxyObject import scala.annotation.nowarn import scala.concurrent.duration.FiniteDuration -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* sealed trait HashOsType @@ -270,7 +270,7 @@ trait JsLibPassword extends ImplicitGetBytes { * * unix generated Unix crypt password compatible hashes (Linux, BSD, ...) * * aix generates AIX password compatible hashes */ -import org.graalvm.polyglot._ +import org.graalvm.polyglot.* final class JsRudderLibImpl( hashKind: HashOsType ) extends ProxyObject { @@ -342,7 +342,7 @@ sealed trait JsRudderLibBinding { object JsRudderLibBinding { - import java.util.{HashMap => JHMap} + import java.util.HashMap as JHMap import javax.script.SimpleBindings private[this] def toBindings(k: String, v: JsRudderLibImpl): Bindings = { @@ -400,7 +400,7 @@ object JsEngineProvider { res.foldZIO( err => (if (JsDirectiveParamLogger.isDebugEnabled) { - import scala.util.{Properties => P} + import scala.util.Properties as P JsDirectiveParamLoggerPure.debug( s"Error when trying to use the JS script engine in a directive. Java version: '${P.javaVersion}'; JVM info: '${P.javaVmInfo}'; name: '${P.javaVmName}'; version: : '${P.javaVmVersion}'; vendor: '${P.javaVmVendor}';" ) *> diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/MergePolicyService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/MergePolicyService.scala index 08e5b971dea..9f81fd235e2 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/MergePolicyService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/MergePolicyService.scala @@ -36,9 +36,9 @@ package com.normation.rudder.services.policies -import cats.data._ +import cats.data.* import cats.kernel.Order -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.RunHook import com.normation.cfclerk.domain.TechniqueGenerationMode import com.normation.cfclerk.domain.TechniqueName @@ -48,7 +48,7 @@ import com.normation.rudder.domain.nodes.NodeInfo import com.normation.rudder.domain.policies.GlobalPolicyMode import com.normation.rudder.domain.policies.PolicyMode import com.normation.utils.Control.traverse -import net.liftweb.common._ +import net.liftweb.common.* /* * This file contains all the logic that allows to build a List of policies, for a node, @@ -253,7 +253,7 @@ object MergePolicyService { s"'${nodeInfo.id.value}' WITH DIFFERENT PARAMETERS VALUE. It's a bug, please report it. Taking one set of parameter " + s"at random for the policy generation." ) - import net.liftweb.json._ + import net.liftweb.json.* implicit val formats: Formats = DefaultFormats def r(j: JValue) = if (j == JNothing) "{}" else prettyRender(j) @@ -399,7 +399,7 @@ object MergePolicyService { } // now change remaining BoundPolicyDraft to Policy, managing tracking variable values others <- { - import cats.implicits._ + import cats.implicits.* (keptUniqueDraft ++ deduplicatedMultiDirective).toList.traverse(_.toPolicy(agent.agentType)) } } yield { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterService.scala index fd3f0b59176..aec834996cc 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterService.scala @@ -37,16 +37,16 @@ package com.normation.rudder.services.policies -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment -import com.normation.rudder.domain.properties._ +import com.normation.rudder.domain.properties.* import com.normation.rudder.domain.properties.PropertyProvider import com.normation.rudder.repository.RoParameterRepository import com.normation.rudder.repository.WoParameterRepository -import net.liftweb.common._ +import net.liftweb.common.* trait RoParameterService { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleApplicationStatusService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleApplicationStatusService.scala index afab52f9e99..3291cfc7700 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleApplicationStatusService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleApplicationStatusService.scala @@ -38,7 +38,7 @@ package com.normation.rudder.services.policies import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.repository.FullNodeGroupCategory import scala.collection.MapView diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleValService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleValService.scala index 91b4131e4f1..77ce42c60f1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleValService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/RuleValService.scala @@ -37,8 +37,8 @@ package com.normation.rudder.services.policies -import com.normation.cfclerk.domain._ -import com.normation.errors._ +import com.normation.cfclerk.domain.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.Rule @@ -46,10 +46,10 @@ import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.repository.FullNodeGroupCategory import com.normation.utils.Control.bestEffort -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime import scala.collection.MapView -import zio.syntax._ +import zio.syntax.* trait RuleValService { def buildRuleVal( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala index c225227cc8b..52a4753104e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.policies -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.SystemVariable import com.normation.cfclerk.domain.SystemVariableSpec import com.normation.cfclerk.domain.Variable @@ -57,10 +57,10 @@ import com.normation.rudder.domain.policies.GroupTarget import com.normation.rudder.domain.policies.RuleTarget import com.normation.rudder.facts.nodes.CoreNodeFact import com.normation.rudder.facts.nodes.RudderAgent -import com.normation.rudder.reports._ +import com.normation.rudder.reports.* import com.normation.rudder.services.servers.PolicyServerManagementService import com.normation.rudder.services.servers.RelaySynchronizationMethod -import com.normation.zio._ +import com.normation.zio.* import java.nio.charset.StandardCharsets import java.time.Duration import java.time.LocalTime @@ -145,7 +145,7 @@ class SystemVariableServiceImpl( getReportProtocolDefault: () => Box[AgentReportingProtocol] ) extends SystemVariableService with Loggable { - import SystemVariableService._ + import SystemVariableService.* // get the Rudder reports DB (postgres) database name from URI val reportsDbName: String = { @@ -188,7 +188,7 @@ class SystemVariableServiceImpl( val varServerVersion = systemVariableSpecService.get("SERVER_VERSION").toVariable(Seq(serverVersion)) - import SendMetrics._ + import SendMetrics.* val sendMetricsValue = getSendMetrics().getOrElse(None) match { case None => "no" case Some(NoMetrics) => "no" diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueAcceptationDatetimeUpdater.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueAcceptationDatetimeUpdater.scala index 4596d6604d6..154b52da4bc 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueAcceptationDatetimeUpdater.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueAcceptationDatetimeUpdater.scala @@ -38,13 +38,13 @@ package com.normation.rudder.services.policies import com.normation.NamedZioLogger -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.RootTechniqueCategoryId import com.normation.cfclerk.domain.SubTechniqueCategoryId import com.normation.cfclerk.domain.TechniqueCategoryId import com.normation.cfclerk.domain.TechniqueName -import com.normation.cfclerk.services._ -import com.normation.errors._ +import com.normation.cfclerk.services.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.domain.logger.ApplicationLoggerPure @@ -54,11 +54,11 @@ import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.WoDirectiveRepository import com.normation.utils.StringUuidGenerator -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Box import org.joda.time.DateTime -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * This handler is in charge to maintain a correct state diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueReloadingCallbacks.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueReloadingCallbacks.scala index e7aadb7fb09..e4cb9280ba3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueReloadingCallbacks.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/TechniqueReloadingCallbacks.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.policies -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.services.TechniqueCategoryModType import com.normation.cfclerk.services.TechniquesLibraryUpdateNotification @@ -49,7 +49,7 @@ import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.domain.eventlog.ReloadTechniqueLibrary import com.normation.rudder.repository.EventLogRepository -import net.liftweb.common._ +import net.liftweb.common.* class DeployOnTechniqueCallback( override val name: String, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/VariableBuilderService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/VariableBuilderService.scala index 8646505f819..59cfb0705d7 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/VariableBuilderService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/VariableBuilderService.scala @@ -39,7 +39,7 @@ package com.normation.rudder.services.policies import com.normation.cfclerk.domain.Variable import com.normation.cfclerk.domain.VariableSpec -import net.liftweb.common._ +import net.liftweb.common.* /** * A service that try to build variables from a list of VariableSpec and diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/WriteNodeCertificatesPem.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/WriteNodeCertificatesPem.scala index abd6281af88..babe54005a3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/WriteNodeCertificatesPem.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/WriteNodeCertificatesPem.scala @@ -39,7 +39,7 @@ package com.normation.rudder.services.policies import better.files.File import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.Certificate import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.nodes.NodeInfo @@ -47,9 +47,9 @@ import com.normation.rudder.hooks.Cmd import com.normation.rudder.hooks.RunNuCommand import com.normation.zio.ZioRuntime import java.nio.charset.StandardCharsets -import zio._ +import zio.* import zio.Duration -import zio.syntax._ +import zio.syntax.* /** * This class will generate a file containing all nodes certificates concatenated. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepository.scala index bfa4fa9f364..4944224b005 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepository.scala @@ -38,11 +38,11 @@ package com.normation.rudder.services.policies.nodeconfig import better.files.File -import cats.implicits._ -import com.normation.box._ +import cats.implicits.* +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.domain.Variable -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.LDAPEntry @@ -57,18 +57,18 @@ import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.services.policies.NodeConfiguration import com.normation.rudder.services.policies.Policy import com.normation.rudder.services.policies.PolicyId -import com.normation.zio._ +import com.normation.zio.* import java.nio.charset.StandardCharsets import net.liftweb.common.Box import net.liftweb.common.Full import net.liftweb.common.Loggable -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat import scala.util.control.NonFatal -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* final case class PolicyHash( draftId: PolicyId, @@ -516,7 +516,7 @@ class FileBasedNodeConfigurationHashRepository(path: String) extends NodeConfigu } private def nonAtomicWrite(hashes: NodeConfigurationHashes): IOResult[Unit] = { - import java.nio.file.StandardOpenOption._ + import java.nio.file.StandardOpenOption.* IOResult.attempt( hashesFile.writeText(NodeConfigurationHashes.toJson(hashes))(Seq(WRITE, CREATE, TRUNCATE_EXISTING), StandardCharsets.UTF_8) ) @@ -628,7 +628,7 @@ class LdapNodeConfigurationHashRepository( private[this] def toLdap(nodeConfigs: Set[NodeConfigurationHash]): LDAPEntry = { val caches = nodeConfigs.map(x => NodeConfigurationHash.toJson(x)) val entry = rudderDit.NODE_CONFIGS.model - entry.resetValuesTo(A_NODE_CONFIG, caches.toSeq: _*) + entry.resetValuesTo(A_NODE_CONFIG, caches.toSeq*) entry } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala index 83d416293bb..e4e8047cd6f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/AgentSpecificLogic.scala @@ -66,7 +66,7 @@ trait AgentSpecificStringEscape { //how do we write bundle sequence / input files system variable for the agent? trait AgentFormatBundleVariables { - import BuildBundleSequence._ + import BuildBundleSequence.* def getBundleVariables( systemInputs: List[InputFile], sytemBundles: List[TechniqueBundles], diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala index 02b26dca100..b719dbfc53b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/BuildBundleSequence.scala @@ -37,14 +37,14 @@ package com.normation.rudder.services.policies.write -import cats.implicits._ +import cats.implicits.* import com.normation.cfclerk.domain.BundleName import com.normation.cfclerk.domain.RunHook import com.normation.cfclerk.domain.SystemVariable import com.normation.cfclerk.domain.TechniqueGenerationMode import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.services.SystemVariableSpecService -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.PolicyGenerationLogger @@ -56,7 +56,7 @@ import com.normation.rudder.services.policies.NodeRunHook import com.normation.rudder.services.policies.Policy import com.normation.rudder.services.policies.PolicyId import scala.collection.immutable.ListMap -import zio._ +import zio.* /** * This file groups together everything related to building the bundle sequence and @@ -235,7 +235,7 @@ class BuildBundleSequence( systemVariableSpecService: SystemVariableSpecService, writeAllAgentSpecificFiles: WriteAllAgentSpecificFiles ) { - import BuildBundleSequence._ + import BuildBundleSequence.* /* * The main entry point of the object: for each variable related to @@ -432,7 +432,7 @@ class BuildBundleSequence( ////////////////////////////////////////////////////////////////////// object CfengineBundleVariables { - import BuildBundleSequence._ + import BuildBundleSequence.* def getBundleVariables( escape: String => String, @@ -566,12 +566,12 @@ object CfengineBundleVariables { * } */ def getBundleForHook(hook: NodeRunHook): (String, List[Bundle]) = { - import JsonRunHookSer._ + import JsonRunHookSer.* val promiser = hook.kind match { case RunHook.Kind.Pre => "pre-run-hook" case RunHook.Kind.Post => "post-run-hook" } - import BundleParam._ + import BundleParam.* (promiser, Bundle(None, BundleName(hook.bundle), List(SimpleQuote(hook.jsonParam, "hook_param"))) :: Nil) } @@ -617,10 +617,10 @@ final case class JsonRunHook( object JsonRunHookSer { implicit class ToJson(private val h: NodeRunHook) extends AnyVal { - import net.liftweb.json._ + import net.liftweb.json.* def jsonParam: String = { val jh = JsonRunHook( - ListMap(h.parameters.map(p => (p.name, p.value)): _*), + ListMap(h.parameters.map(p => (p.name, p.value))*), h.reports.map(r => JsonRunHookReport(r.id.getReportId, r.mode.name, r.technique, r.report.name, r.report.value.getOrElse("None")) ) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala index 6ee19d5c87f..bb0b8e98116 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.policies.write -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.inventory.domain.AgentType.CfeCommunity import com.normation.inventory.domain.AgentType.CfeEnterprise diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala index 05b8a4c474c..0d8d6f64d90 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala @@ -37,16 +37,16 @@ package com.normation.rudder.services.policies.write -import better.files._ +import better.files.* import cats.data.NonEmptyList -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.SystemVariable import com.normation.cfclerk.domain.TechniqueFile import com.normation.cfclerk.domain.TechniqueResourceId import com.normation.cfclerk.domain.TechniqueTemplate import com.normation.cfclerk.domain.Variable import com.normation.cfclerk.services.TechniqueRepository -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.Constants @@ -69,7 +69,7 @@ import com.normation.templates.FillTemplatesService import com.normation.templates.FillTemplateThreadUnsafe import com.normation.templates.FillTemplateTimer import com.normation.templates.STVariable -import com.normation.zio._ +import com.normation.zio.* import java.nio.charset.Charset import java.nio.file.AtomicMoveNotSupportedException import java.nio.file.FileAlreadyExistsException @@ -80,14 +80,14 @@ import java.nio.file.StandardCopyOption import java.nio.file.StandardOpenOption import java.nio.file.attribute.PosixFilePermission import java.util.concurrent.TimeUnit -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.json.JsonAST import net.liftweb.json.JsonAST.JValue import org.apache.commons.io.FileUtils import org.joda.time.DateTime -import zio._ +import zio.* import zio.Duration -import zio.syntax._ +import zio.syntax.* /** * Write promises for the set of nodes, with the given configs. @@ -112,7 +112,7 @@ trait PolicyWriterService { } object PolicyWriterServiceImpl { - import PosixFilePermission._ + import PosixFilePermission.* // we want: /bin/chmod u-x,u+rwX,g-wx,g+rX,o-rwx ... for nodes other than root val defaultFilePerms: Set[PosixFilePermission] = Set[PosixFilePermission](OWNER_READ, OWNER_WRITE, GROUP_READ) val defaultDirectoryPerms: Set[PosixFilePermission] = @@ -238,7 +238,7 @@ class PolicyWriterServiceImpl( implicit val charset: Charset, groupOwner: Option[String] ) extends PolicyWriterService { - import com.normation.rudder.services.policies.write.PolicyWriterServiceImpl._ + import com.normation.rudder.services.policies.write.PolicyWriterServiceImpl.* val clock = ZioRuntime.environment val timingLogger = PolicyGenerationLoggerPure.timing @@ -259,7 +259,7 @@ class PolicyWriterServiceImpl( (groupOwner, defaultFilePerms, defaultDirectoryPerms) } } - import StandardOpenOption._ + import StandardOpenOption.* // open file mode for create or overwrite mode def createParentsAndWrite(text: String, isRootServer: Boolean): IO[SystemError, Unit] = IOResult.attempt { val (optGroupOwner, filePerms, dirPerms) = getPerms(isRootServer) @@ -279,7 +279,7 @@ class PolicyWriterServiceImpl( private[this] def writeNodePropertiesFile(agentNodeConfig: AgentNodeConfiguration) = { def generateNodePropertiesJson(properties: Seq[NodeProperty]): JValue = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* ("properties" -> properties.toDataJson) } @@ -299,8 +299,8 @@ class PolicyWriterServiceImpl( private[this] def writeRudderParameterFile(agentNodeConfig: AgentNodeConfiguration): IOResult[Unit] = { def generateParametersJson(parameters: Set[ParameterEntry]): JValue = { - import com.normation.rudder.domain.properties.JsonPropertySerialisation._ - import net.liftweb.json.JsonDSL._ + import com.normation.rudder.domain.properties.JsonPropertySerialisation.* + import net.liftweb.json.JsonDSL.* ("parameters" -> parameters.toDataJson) } @@ -496,7 +496,7 @@ class PolicyWriterServiceImpl( _ <- logNodeConfigurations systemEnv <- System.envs.foldZIO( err => SystemError("error when accessing environment variable to run hooks", err).fail, - vars => HookEnvPairs.build(vars.toSeq: _*).succeed + vars => HookEnvPairs.build(vars.toSeq*).succeed ) readTemplateTime1 <- currentTimeMillis configAndPaths <- @@ -1084,7 +1084,7 @@ class PolicyWriterServiceImpl( val dest = File(paths.newFolder, filepaths.POLICY_SERVER_CERT) // we can't overwrite a file with a symlink, so erase existing one if (dest.exists) { dest.delete() } - Files.createSymbolicLink(dest.path, source, File.Attributes.default: _*) + Files.createSymbolicLink(dest.path, source, File.Attributes.default*) dest } } @@ -1095,7 +1095,7 @@ class PolicyWriterServiceImpl( private[this] def systemVariableToJson(vars: Map[String, Variable]): String = { // only keep system variables, sort them by name - import net.liftweb.json._ + import net.liftweb.json.* // remove these system vars (perhaps they should not even be there, in fact) val filterOut = Set( diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala index d192c886449..0bbef9f0f6b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala @@ -37,10 +37,10 @@ package com.normation.rudder.services.policies.write -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.cfclerk.services.SystemVariableSpecService import com.normation.cfclerk.services.TechniqueRepository -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.inventory.domain.Certificate import com.normation.inventory.domain.NodeId @@ -54,11 +54,11 @@ import com.normation.rudder.services.policies.NodeConfiguration import com.normation.rudder.services.policies.ParameterEntry import com.normation.rudder.services.policies.Policy import com.normation.templates.STVariable -import com.normation.zio._ +import com.normation.zio.* import org.joda.time.DateTime import scala.collection.immutable.ArraySeq -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* case class PrepareTemplateTimer( buildBundleSeq: Ref[Long], @@ -124,7 +124,7 @@ class PrepareTemplateVariablesImpl( timer: PrepareTemplateTimer ): IOResult[AgentNodeWritableConfiguration] = { - import com.normation.rudder.services.policies.SystemVariableService._ + import com.normation.rudder.services.policies.SystemVariableService.* val nodeId = agentNodeConfig.config.nodeInfo.id diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala index 404559d5163..568e9d59a46 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala @@ -37,13 +37,13 @@ package com.normation.rudder.services.queries -import cats.implicits._ -import com.normation.box._ -import com.normation.rudder.domain.queries._ -import com.normation.rudder.services.queries.CmdbQueryParser._ +import cats.implicits.* +import com.normation.box.* +import com.normation.rudder.domain.queries.* +import com.normation.rudder.services.queries.CmdbQueryParser.* import com.normation.utils.Control.traverse -import net.liftweb.common._ -import net.liftweb.json._ +import net.liftweb.common.* +import net.liftweb.json.* import net.liftweb.json.JsonParser.ParseException /** @@ -215,7 +215,7 @@ trait JsonQueryLexer extends QueryLexer { def parseCriterionLine(json: JObject): Box[List[StringCriterionLine]] = { json.values.get(CRITERIA) match { case None => Full(List[StringCriterionLine]()) - case Some(arr: List[_]) => + case Some(arr: List[?]) => // try to parse all lines. On the first parsing error (parseCrtierion returns Failure), // stop and return a Failure // if all parsing are OK, return a Full(list(criterionLine) @@ -271,7 +271,7 @@ trait JsonQueryLexer extends QueryLexer { Failure("Bad query format for '%s' parameter in line '%s'. Expecting a string, found '%s'".format(OBJECT, line, x)) json match { - case l: Map[_, _] => + case l: Map[?, ?] => l.head match { case (x: String, y: String) => val line = l.asInstanceOf[Map[String, String]] // is map always homogenous ? diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala index 343bafd72f8..47366c16c1e 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala @@ -37,17 +37,17 @@ package com.normation.rudder.services.queries -import cats.implicits._ -import com.normation.box._ -import com.normation.errors._ +import cats.implicits.* +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.inventory.ldap.core.LDAPConstants -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ -import com.normation.ldap.sdk.syntax._ +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* +import com.normation.ldap.sdk.syntax.* import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.logger.DynamicGroupLoggerPure import com.normation.rudder.domain.logger.NodeLogger import com.normation.rudder.domain.logger.NodeLoggerPure @@ -65,10 +65,10 @@ import com.unboundid.ldap.sdk.Filter import com.unboundid.ldap.sdk.LDAPSearchException import com.unboundid.ldap.sdk.ResultCode import com.unboundid.ldap.sdk.SearchRequest -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime -import zio.{System => _, _} -import zio.syntax._ +import zio.{System as _, *} +import zio.syntax.* /** * A service used to manage dynamic groups : find @@ -121,7 +121,7 @@ class DynGroupServiceImpl( override def getAllDynGroups(): Box[Seq[NodeGroup]] = { for { con <- ldap - entries <- con.searchSub(rudderDit.GROUP.dn, dynGroupFilter, dynGroupAttrs: _*) + entries <- con.searchSub(rudderDit.GROUP.dn, dynGroupFilter, dynGroupAttrs*) dyngroups <- ZIO.foreach(entries) { entry => mapper.entry2NodeGroup(entry).toIO.chainError(s"Can not map entry to a node group: ${entry}") } @@ -138,7 +138,7 @@ class DynGroupServiceImpl( def getAllDynGroupsWithandWithoutDependencies(): Box[(Seq[NodeGroupId], Seq[NodeGroupId])] = { (for { con <- ldap - entries <- con.searchSub(rudderDit.GROUP.dn, dynGroupFilter, dynGroupAttrs: _*) + entries <- con.searchSub(rudderDit.GROUP.dn, dynGroupFilter, dynGroupAttrs*) dyngroups <- ZIO.foreach(entries) { entry => mapper.entry2NodeGroup(entry).toIO.chainError(s"Can not map entry to a node group: ${entry}") } @@ -253,7 +253,7 @@ object CheckPendingNodeInDynGroups { class CheckPendingNodeInDynGroups( queryChecker: QueryChecker ) { - import CheckPendingNodeInDynGroups._ + import CheckPendingNodeInDynGroups.* /** * For each node in the list, find @@ -317,7 +317,7 @@ class CheckPendingNodeInDynGroups( blocked: List[DynGroup], done: List[(NodeGroupId, Set[NodeId])] ): IOResult[List[(NodeGroupId, Set[NodeId])]] = { - import com.normation.rudder.domain.queries.{And => CAnd} + import com.normation.rudder.domain.queries.And as CAnd NodeLogger.PendingNode.Policies.trace("TODO :" + todo.debugString) NodeLogger.PendingNode.Policies.trace("BLOCKED:" + blocked.debugString) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupUpdaterService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupUpdaterService.scala index 2168958c1a5..772221e1e5a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupUpdaterService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupUpdaterService.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.queries -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId @@ -46,7 +46,7 @@ import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.WoNodeGroupRepository -import net.liftweb.common._ +import net.liftweb.common.* /** * A container for a dynamic group update. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala index de6a80dddab..52af66439d9 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala @@ -36,33 +36,33 @@ package com.normation.rudder.services.queries -import cats.implicits._ +import cats.implicits.* import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.RudderError -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core._ -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk._ -import com.normation.ldap.sdk.BuildFilter._ -import com.normation.ldap.sdk.LDAPIOResult._ -import com.normation.ldap.sdk.syntax._ -import com.normation.rudder.domain._ +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.* +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.* +import com.normation.ldap.sdk.BuildFilter.* +import com.normation.ldap.sdk.LDAPIOResult.* +import com.normation.ldap.sdk.syntax.* +import com.normation.rudder.domain.* import com.normation.rudder.domain.nodes.NodeInfo -import com.normation.rudder.domain.queries._ +import com.normation.rudder.domain.queries.* import com.normation.rudder.facts.nodes.CoreNodeFact import com.normation.rudder.facts.nodes.NodeFactRepository import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.facts.nodes.SelectNodeStatus import com.normation.rudder.repository.ldap.LDAPEntityMapper import com.normation.zio.currentTimeMillis -import com.unboundid.ldap.sdk.{LDAPConnection => _, SearchScope => _, _} +import com.unboundid.ldap.sdk.{LDAPConnection as _, SearchScope as _, *} import com.unboundid.ldap.sdk.DereferencePolicy.NEVER import java.util.regex.Pattern import org.slf4j.Logger import org.slf4j.LoggerFactory -import zio.{System => _, _} -import zio.syntax._ +import zio.{System as _, *} +import zio.syntax.* /* * We have two type of filters: @@ -280,7 +280,7 @@ class InternalLDAPQueryProcessor( limits: RequestLimits = DefaultRequestLimits ) { - import ditQueryData._ + import ditQueryData.* val logPure = InternalLDAPQueryProcessorLoggerPure /** @@ -568,20 +568,20 @@ class InternalLDAPQueryProcessor( Some( NOT(HAS(A_OC)) ) // means that we don't have any ldap filter, only extended one, so select no nodes, see #19538 - } else Some(OR((filterSeqSet.foldLeft(ldapFilters)(_ union _)).toSeq: _*)) + } else Some(OR((filterSeqSet.foldLeft(ldapFilters)(_ union _)).toSeq*)) case And => // if returnFilter is None, just and other filter, else add it. TODO : may it be empty ? val seqFilter = ldapFilters.toSeq ++ filterSeqSet.flatMap(s => { s.size match { case n if n < 1 => None case 1 => Some(s.head) - case _ => Some(OR(s.toSeq: _*)) + case _ => Some(OR(s.toSeq*)) } }) seqFilter.size match { case x if x < 1 => None case 1 => Some(seqFilter.head) - case _ => Some(AND(seqFilter: _*)) + case _ => Some(AND(seqFilter*)) } } (finalLdapFilter, specialFilters) @@ -659,8 +659,8 @@ class InternalLDAPQueryProcessor( case 1 => Some(ldapFilters.head) case n => query.composition match { - case And => Some(AND(ldapFilters.toSeq: _*)) - case Or => Some(OR(ldapFilters.toSeq: _*)) + case And => Some(AND(ldapFilters.toSeq*)) + case Or => Some(OR(ldapFilters.toSeq*)) } } @@ -753,7 +753,7 @@ class InternalLDAPQueryProcessor( limits.subRequestTimeLimit, false, finalFilter, - params._2.toSeq: _* + params._2.toSeq* ) } } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala index 992a033f9ee..7cf049baad8 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.queries -import com.normation.box._ +import com.normation.box.* import com.normation.errors.IOResult import com.normation.inventory.domain.AcceptedInventory import com.normation.inventory.domain.InventoryStatus @@ -48,15 +48,15 @@ import com.normation.rudder.domain.logger.FactQueryProcessorLoggerPure import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.nodes.NodeGroupUid import com.normation.rudder.domain.nodes.NodeKind -import com.normation.rudder.domain.queries._ +import com.normation.rudder.domain.queries.* import com.normation.rudder.facts.nodes.CoreNodeFact import com.normation.rudder.facts.nodes.NodeFactRepository import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.facts.nodes.SelectNodeStatus -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Box -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * A NodeFactMatcher is the transformation of a query into a method that is able to diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala index a5b16f2073a..040cb2ba930 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchBackendImpl.scala @@ -38,15 +38,15 @@ package com.normation.rudder.services.quicksearch import com.normation.errors.IOResult -import com.normation.inventory.ldap.core.LDAPConstants._ -import com.normation.ldap.sdk.BuildFilter._ +import com.normation.inventory.ldap.core.LDAPConstants.* +import com.normation.ldap.sdk.BuildFilter.* import com.normation.ldap.sdk.LDAPBoolean import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.LDAPEntry import com.normation.ldap.sdk.RoLDAPConnection import com.normation.ldap.sdk.Sub import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.policies.Tag import com.normation.rudder.domain.policies.TagName import com.normation.rudder.domain.policies.TagValue @@ -82,10 +82,10 @@ object QSPattern { * of everything else. */ object QSNodeFactBackend extends Loggable { - import QSAttribute.{NodeId => QSNodeId, _} - import QSObject.{Node => QSNode} + import QSAttribute.{NodeId as QSNodeId, *} + import QSObject.Node as QSNode import QuickSearchResultId.QRNodeId - import zio.syntax._ + import zio.syntax.* /* * The filter that allows to know if a couple (activeTechnique, directive) match @@ -184,12 +184,12 @@ object QSNodeFactBackend extends Loggable { } object QSDirectiveBackend extends Loggable { - import QSAttribute.{DirectiveId => QSDirectiveId, _} - import QSObject.{Directive => QSDirective} + import QSAttribute.{DirectiveId as QSDirectiveId, *} + import QSObject.Directive as QSDirective import QuickSearchResultId.QRDirectiveId import com.normation.rudder.domain.policies.Directive import com.normation.rudder.repository.FullActiveTechnique - import zio.syntax._ + import zio.syntax.* /* * The filter that allows to know if a couple (activeTechnique, directive) match @@ -303,8 +303,8 @@ object QSDirectiveBackend extends Loggable { * but not Directives nor Nodes */ object QSLdapBackend { - import QSAttribute._ - import QSObject._ + import QSAttribute.* + import QSObject.* /** * The actual search logic, everything else is just glue to make it works. @@ -317,8 +317,8 @@ object QSLdapBackend { val ocFilter = query.objectClass.map(_.filter).flatten.toSeq val attrFilter = query.attributes.map(_.filter(query.userToken)).flatten.toSeq val filter = AND( - OR(ocFilter: _*), - OR(attrFilter: _*) + OR(ocFilter*), + OR(attrFilter*) ) // the ldap query part. It should be in a box, but the person who implemented ldap backend was // not really strict on the semantic @@ -328,7 +328,7 @@ object QSLdapBackend { for { connection <- ldap - entries <- connection.search(rudderDit.BASE_DN, Sub, filter, returnedAttributes: _*) + entries <- connection.search(rudderDit.BASE_DN, Sub, filter, returnedAttributes*) } yield { if (ocFilter.isEmpty || attrFilter.isEmpty) { // nothing to search for in that backend @@ -457,7 +457,7 @@ object QSLdapBackend { } implicit class QSAttributeLdapFilter(val a: QSAttribute) extends AnyVal { - import QSAttributeLdapFilter._ + import QSAttributeLdapFilter.* def filter(token: String): Option[Filter] = { a match { @@ -565,8 +565,8 @@ object QSLdapBackend { * correctly transform entry to a result, putting what is needed in type and description */ implicit final class EntryToSearchResult(val e: LDAPEntry) { - import QSAttributeLdapFilter._ - import QuickSearchResultId._ + import QSAttributeLdapFilter.* + import QuickSearchResultId.* def toResult(query: Query): Option[QuickSearchResult] = { def getId(e: LDAPEntry): Option[QuickSearchResultId] = { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala index c141658c883..7e7bba03f28 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchDomain.scala @@ -208,7 +208,7 @@ object QSAttribute { sealed trait QSObject { def name: String; def attributes: Set[QSAttribute] } object QSObject { - import QSAttribute._ + import QSAttribute.* val tagsAttribute: Set[QSAttribute] = Set(Tags, TagKeys, TagValues) @@ -301,7 +301,7 @@ object QSMapping { // set of names by attribute val attributeNames: Map[QSAttribute, Set[String]] = { - import QSAttribute._ + import QSAttribute.* val descriptions = Set(Description, LongDescription).map(_.name) ++ Set("descriptions") val properties = Set(Properties, GroupProperties, CustomProperties).map(_.name) ++ Set("node.props", "nodeprops", "node_properties", "nodeproperties") ++ @@ -388,7 +388,7 @@ object QSMapping { sealed trait QuickSearchResultId extends Any { def value: String; def tpe: QSObject } object QuickSearchResultId { - import QSObject._ + import QSObject.* final case class QRNodeId(value: String) extends AnyVal with QuickSearchResultId { override def tpe: QSObject.Node.type = Node } final case class QRGroupId(value: String) extends AnyVal with QuickSearchResultId { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala index de7f638e98b..2987f2a60b1 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchQueryParser.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.quicksearch -import com.normation.errors._ +import com.normation.errors.* /** * This file contains an implementation of the query parser @@ -49,8 +49,8 @@ object QSRegexQueryParser { * In our parser, whitespace are relevant, but only in the query string, * not as a separator of different tokens. */ - import fastparse._ - import fastparse.SingleLineWhitespace._ + import fastparse.* + import fastparse.SingleLineWhitespace.* /* * parse a string like: @@ -241,7 +241,7 @@ object QSRegexQueryParser { * inputs */ private[this] def getObjects(names: Set[String]): PureResult[(Set[QSObject], Set[String])] = { - import QSMapping._ + import QSMapping.* getMapping(names, objectNameMapping) } @@ -250,7 +250,7 @@ object QSRegexQueryParser { * We try to be kind with users: not case sensitive, not plural sensitive */ private[this] def getAttributes(names: Set[String]): PureResult[(Set[QSAttribute], Set[String])] = { - import QSMapping._ + import QSMapping.* getMapping(names, attributeNameMapping).map { case (attrs, keys) => (attrs.flatten, keys) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala index 6cb9121034e..d4bd2f72693 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/quicksearch/QuickSearchService.scala @@ -38,7 +38,7 @@ package com.normation.rudder.services.quicksearch import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.ldap.core.InventoryDit import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RoLDAPConnection @@ -65,7 +65,7 @@ class FullQuickSearchService(implicit val nodeInfos: NodeFactRepository ) { - import QuickSearchService._ + import QuickSearchService.* val logger = FullQuickSearchServiceLoggerPure /** @@ -112,7 +112,7 @@ object QuickSearchService { nodeFactRepo: NodeFactRepository ) { - import QSBackend._ + import QSBackend.* def search(query: Query)(implicit qc: QueryContext): IOResult[Seq[QuickSearchResult]] = b match { case LdapBackend => QSLdapBackend.search(query) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala index eff56e2f501..2b5f4eea33f 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala @@ -39,20 +39,20 @@ package com.normation.rudder.services.reports import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.ComplianceDebugLogger -import com.normation.rudder.domain.logger.ComplianceDebugLogger._ +import com.normation.rudder.domain.logger.ComplianceDebugLogger.* import com.normation.rudder.domain.logger.TimingDebugLogger import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.domain.reports.ReportType.BadPolicyMode -import com.normation.rudder.reports._ +import com.normation.rudder.reports.* import com.normation.rudder.reports.execution.AgentRunId import com.normation.rudder.reports.execution.AgentRunWithNodeConfig import java.util.regex.Pattern import net.liftweb.common.Loggable import org.apache.commons.lang3.StringUtils -import org.joda.time._ +import org.joda.time.* import scala.annotation.tailrec import scala.util.matching.Regex diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeChangesService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeChangesService.scala index c791abe83e8..d70189c16a3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeChangesService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeChangesService.scala @@ -37,23 +37,23 @@ package com.normation.rudder.services.reports -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.rudder.domain.logger.ReportLoggerPure import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.reports.ResultRepairedReport import com.normation.rudder.repository.CachedRepository import com.normation.rudder.repository.ReportsRepository -import com.normation.zio._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.common.* import net.liftweb.common.Box import net.liftweb.common.Loggable import net.liftweb.http.js -import net.liftweb.http.js.JE._ +import net.liftweb.http.js.JE.* import org.joda.time.DateTime import org.joda.time.Interval -import zio.{System => _, _} -import zio.syntax._ +import zio.{System as _, *} +import zio.syntax.* /** * This service is responsible to make available node changes for nodes. @@ -223,7 +223,7 @@ class CachedNodeChangesServiceImpl( updates.headOption match { case None => current case Some(h) => - import ChangesUpdate._ + import ChangesUpdate.* val c = (h, current) match { case (Init, Init) => Init case (Init, For(a, b)) => For(a, b) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeConfigurationService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeConfigurationService.scala index 62d1ea94bcf..baea323175c 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeConfigurationService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/NodeConfigurationService.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.reports -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.ReportLoggerPure import com.normation.rudder.domain.policies.DirectiveId @@ -48,9 +48,9 @@ import com.normation.rudder.facts.nodes.NodeFactRepository import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.repository.CachedRepository import com.normation.rudder.repository.FindExpectedReportRepository -import com.normation.zio._ -import zio._ -import zio.syntax._ +import com.normation.zio.* +import zio.* +import zio.syntax.* /** * That service retrieve node configurations (nodeexpectedreports) from the expectedreportsjdbcrepository, unless its already in cache @@ -192,7 +192,7 @@ class CachedNodeConfigurationService( * Do something with the action we received */ private[this] def performAction(action: CacheExpectedReportAction): IOResult[Unit] = { - import CacheExpectedReportAction._ + import CacheExpectedReportAction.* // in a semaphore semaphore.withPermit( (action match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala index 4ce26187e99..97b5cc7a637 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala @@ -37,8 +37,8 @@ package com.normation.rudder.services.reports -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.ReportLogger import com.normation.rudder.domain.logger.ReportLoggerPure @@ -48,7 +48,7 @@ import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.GlobalPolicyMode import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.domain.reports.NodeStatusReport import com.normation.rudder.domain.reports.RuleStatusReport import com.normation.rudder.facts.nodes.NodeFactRepository @@ -59,15 +59,15 @@ import com.normation.rudder.reports.GlobalComplianceMode import com.normation.rudder.reports.ReportsDisabled import com.normation.rudder.reports.execution.AgentRunId import com.normation.rudder.reports.execution.RoReportsExecutionRepository -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.score.ComplianceScoreEvent import com.normation.rudder.score.ScoreServiceManager import com.normation.utils.Control.traverse -import com.normation.zio._ -import net.liftweb.common._ -import org.joda.time._ -import zio.{System => _, _} -import zio.syntax._ +import com.normation.zio.* +import net.liftweb.common.* +import org.joda.time.* +import zio.{System as _, *} +import zio.syntax.* object ReportingServiceUtils { @@ -416,8 +416,8 @@ trait CachedFindRuleNodeStatusReports * All actions must have *exactly* the *same* type */ private[this] def performAction(actions: Chunk[CacheComplianceQueueAction]): IOResult[Unit] = { - import CacheComplianceQueueAction._ - import CacheExpectedReportAction._ + import CacheComplianceQueueAction.* + import CacheExpectedReportAction.* // get type of action (actions.headOption match { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerData.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerData.scala index 07e85492e70..2e09b943609 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerData.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerData.scala @@ -39,8 +39,8 @@ package com.normation.rudder.services.servers import com.normation.inventory.domain.NodeId import inet.ipaddr.IPAddressString -import io.scalaland.chimney.dsl._ -import zio.json._ +import io.scalaland.chimney.dsl.* +import zio.json.* /* * All policy servers. A root and 0 or more relays diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala index 01a9ea68aea..6e7a8d0699b 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala @@ -41,7 +41,7 @@ import ca.mrvisser.sealerate import cats.data.NonEmptyList import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.EventLogDetails import com.normation.eventlog.ModificationId @@ -82,17 +82,17 @@ import com.normation.rudder.domain.queries.ResultTransformation import com.normation.rudder.domain.queries.StringComparator import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.rule.category.RuleCategoryId -import com.normation.rudder.services.servers.json._ -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.rudder.services.servers.json.* +import com.normation.zio.* +import com.softwaremill.quicklens.* import com.unboundid.ldap.sdk.DN import net.liftweb.common.Box import net.liftweb.common.Failure import net.liftweb.common.Full import net.liftweb.common.Loggable -import zio._ -import zio.json._ -import zio.syntax._ +import zio.* +import zio.json.* +import zio.syntax.* /** * This service allows to manage properties linked to the root policy server, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DatabaseManager.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DatabaseManager.scala index 566e27cfeb7..7610416b318 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DatabaseManager.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DatabaseManager.scala @@ -40,7 +40,7 @@ package com.normation.rudder.services.system import com.normation.rudder.repository.ReportsRepository import com.normation.rudder.repository.UpdateExpectedReportsRepository import com.normation.utils.Control -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.common.Loggable import org.joda.time.DateTime import scala.concurrent.duration.Duration diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DebugInfoService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DebugInfoService.scala index 2ab4805f254..dba2bd62f8a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DebugInfoService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/system/DebugInfoService.scala @@ -38,15 +38,15 @@ package com.normation.rudder.services.system import com.normation.NamedZioLogger -import com.normation.errors._ -import com.normation.rudder.hooks._ -import com.normation.zio._ +import com.normation.errors.* +import com.normation.rudder.hooks.* +import com.normation.zio.* import java.nio.file.Files import java.nio.file.Paths import java.util.concurrent.TimeUnit -import scala.jdk.CollectionConverters._ -import zio._ -import zio.syntax._ +import scala.jdk.CollectionConverters.* +import zio.* +import zio.syntax.* final case class DebugInfoScriptResult( serverName: String, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/ChangeRequestService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/ChangeRequestService.scala index 7675519081f..0084a5a6245 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/ChangeRequestService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/ChangeRequestService.scala @@ -51,7 +51,7 @@ import com.normation.rudder.domain.policies.ModifyToRuleDiff import com.normation.rudder.domain.policies.Rule import com.normation.rudder.domain.properties.ChangeRequestGlobalParameterDiff import com.normation.rudder.domain.properties.GlobalParameter -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.domain.workflows.ChangeRequestInfo import org.joda.time.DateTime diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala index 577b626cb2a..d5927deecf3 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/CommitAndDeployChangeRequestService.scala @@ -37,10 +37,10 @@ package com.normation.rudder.services.workflows -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.xmlparsers.SectionSpecParser -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.batch.AsyncDeploymentActor @@ -51,20 +51,20 @@ import com.normation.rudder.domain.nodes.AddNodeGroupDiff import com.normation.rudder.domain.nodes.DeleteNodeGroupDiff import com.normation.rudder.domain.nodes.ModifyToNodeGroupDiff import com.normation.rudder.domain.nodes.NodeGroup -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.properties._ -import com.normation.rudder.domain.workflows._ -import com.normation.rudder.repository._ +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.properties.* +import com.normation.rudder.domain.workflows.* +import com.normation.rudder.repository.* import com.normation.rudder.services.marshalling.XmlSerializer import com.normation.rudder.services.marshalling.XmlUnserializer import com.normation.rudder.services.policies.DependencyAndDeletionService import com.normation.rudder.services.queries.DynGroupUpdaterService -import com.normation.utils.Control._ +import com.normation.utils.Control.* import com.normation.utils.StringUuidGenerator import java.io.ByteArrayInputStream import java.nio.charset.StandardCharsets -import net.liftweb.common._ -import scala.xml._ +import net.liftweb.common.* +import scala.xml.* /** * A service responsible to actually commit a change request, diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/WorkflowService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/WorkflowService.scala index 8722cb54635..42a47422b88 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/WorkflowService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/workflows/WorkflowService.scala @@ -50,8 +50,8 @@ import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.domain.policies.Rule import com.normation.rudder.domain.policies.RuleUid import com.normation.rudder.domain.properties.GlobalParameter -import com.normation.rudder.domain.workflows._ -import net.liftweb.common._ +import com.normation.rudder.domain.workflows.* +import net.liftweb.common.* case object WorkflowUpdate diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/User.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/User.scala index 5385bca0594..5c98da65646 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/User.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/User.scala @@ -40,8 +40,8 @@ package com.normation.rudder.users import com.normation.eventlog.EventActor import com.normation.utils.DateFormaterService import org.joda.time.DateTime -import zio.json._ -import zio.json.ast._ +import zio.json.* +import zio.json.ast.* /* * Base data structures about users and everything related to their authentication: user information, user session. diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/UserRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/UserRepository.scala index ca43f56c115..0ff87703a9a 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/UserRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/UserRepository.scala @@ -42,15 +42,15 @@ import com.normation.errors.IOResult import com.normation.rudder.db.Doobie import com.normation.rudder.domain.logger.ApplicationLoggerPure import com.normation.utils.DateFormaterService -import com.softwaremill.quicklens._ -import doobie._ -import doobie.free.connection.{unit => connectionUnit} -import doobie.implicits._ -import doobie.postgres.implicits._ +import com.softwaremill.quicklens.* +import doobie.* +import doobie.free.connection.unit as connectionUnit +import doobie.implicits.* +import doobie.postgres.implicits.* import org.joda.time.DateTime -import zio._ -import zio.interop.catz._ -import zio.json.ast._ +import zio.* +import zio.interop.catz.* +import zio.json.ast.* /* * Repository that deals with users and sessions @@ -540,9 +540,9 @@ class InMemoryUserRepository(userBase: Ref[Map[String, UserInfo]], sessionBase: */ class JdbcUserRepository(doobie: Doobie) extends UserRepository { import com.normation.rudder.db.Doobie.DateTimeMeta - import com.normation.rudder.db.json.implicits._ - import com.normation.rudder.users.UserSerialization._ - import doobie._ + import com.normation.rudder.db.json.implicits.* + import com.normation.rudder.users.UserSerialization.* + import doobie.* implicit val statusHistoryMeta: Meta[List[StatusHistory]] = new Meta(pgDecoderGet, pgEncoderPut) implicit val otherInfoMeta: Meta[Json.Obj] = new Meta(pgDecoderGet, pgEncoderPut) @@ -664,7 +664,7 @@ class JdbcUserRepository(doobie: Doobie) extends UserRepository { case h :: t => // get managed (all from that origin) and zombies (in the given list of existing, but deleted) val updatable = sql"""select * from users where managedby = ${origin} or (status = 'deleted' and """ ++ - Fragments.in(fr"id", NonEmptyList.of(h, t: _*)) ++ + Fragments.in(fr"id", NonEmptyList.of(h, t*)) ++ fr")" def update(updated: Vector[UserInfo]): ConnectionIO[Int] = { @@ -703,7 +703,7 @@ class JdbcUserRepository(doobie: Doobie) extends UserRepository { // predicate used as condition for selecting users for both delete/disable and purge private[users] def predicateUser(userIds: List[String]): Option[Fragment] = userIds match { case Nil => None - case h :: t => Some(Fragments.in(fr"id", NonEmptyList.of(h, t: _*))) + case h :: t => Some(Fragments.in(fr"id", NonEmptyList.of(h, t*))) } private[users] def predicateLogDate(lastLogin: Option[DateTime]): Option[Fragment] = lastLogin match { @@ -715,7 +715,7 @@ class JdbcUserRepository(doobie: Doobie) extends UserRepository { // this one is inverted: origin empty means you can always purge (but only preselected user from other filters) private[users] def predicateNotOrigin(origins: List[String]): Option[Fragment] = origins match { case Nil => None - case h :: t => Some(Fragments.notIn(fr"managedby", NonEmptyList.of(h, t: _*))) + case h :: t => Some(Fragments.notIn(fr"managedby", NonEmptyList.of(h, t*))) } // select users ID and StatusHistory based on previous predicate and possibly further refinements. @@ -885,7 +885,7 @@ class JdbcUserRepository(doobie: Doobie) extends UserRepository { params match { case Nil => ZIO.unit case h :: tail => - val sql = fr"""update users""" ++ Fragments.set(h, tail: _*) ++ fr"""where id = ${id}""" + val sql = fr"""update users""" ++ Fragments.set(h, tail*) ++ fr"""where id = ${id}""" transactIOResult(s"Error when updating user information for '${id}'")(xa => sql.update.run.transact(xa)).unit } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/JsonSpecMatcher.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/JsonSpecMatcher.scala index f66401f7372..4f22b9b5e36 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/JsonSpecMatcher.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/JsonSpecMatcher.scala @@ -1,6 +1,6 @@ package com.normation -import _root_.zio.json._ +import _root_.zio.json.* import _root_.zio.json.ast.Json import org.specs2.execute.FailureDetails import org.specs2.matcher.EqualityMatcher @@ -14,7 +14,7 @@ import org.specs2.mutable.Specification trait JsonSpecMatcher { self: MustMatchers with Specification => - import JsonSpecMatcher._ + import JsonSpecMatcher.* /** * Tests for a non-strict equality of json, by comparing the string. diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/SomeTestNonUnit.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/SomeTestNonUnit.scala index 28d07adb801..cfe9d44b5e6 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/SomeTestNonUnit.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/SomeTestNonUnit.scala @@ -24,13 +24,13 @@ package com.normation -import _root_.zio._ -import com.normation.box._ +import _root_.zio.* +import com.normation.box.* import com.normation.errors.IOResult import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.services.policies.TestNodeConfiguration -import com.normation.zio._ +import com.normation.zio.* import java.io.File import net.liftweb.actor.LAScheduler diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/BundleOrderTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/BundleOrderTest.scala index f7e9ffdbdbc..f0083b0259d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/BundleOrderTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/BundleOrderTest.scala @@ -39,8 +39,8 @@ package com.normation.cfclerk.domain import com.normation.rudder.services.policies.BundleOrder import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class BundleOrderTest extends Specification { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/HashAlgoTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/HashAlgoTest.scala index 614efc4066d..ff9996033b0 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/HashAlgoTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/HashAlgoTest.scala @@ -39,7 +39,7 @@ package com.normation.cfclerk.domain import com.normation.cfclerk.domain.AixPasswordHashAlgo.ShaSpec import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala index 9adead6d8c5..5a0e321c1cb 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/SectionTest.scala @@ -37,14 +37,14 @@ package com.normation.cfclerk.domain -import com.normation.cfclerk.xmlparsers._ -import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants._ +import com.normation.cfclerk.xmlparsers.* +import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants.* import java.io.FileNotFoundException -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import org.xml.sax.SAXParseException -import scala.xml._ +import scala.xml.* @RunWith(classOf[JUnitRunner]) class SectionTest extends Specification { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueCategoryIdTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueCategoryIdTest.scala index d0947c0c900..94084cc9999 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueCategoryIdTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueCategoryIdTest.scala @@ -37,9 +37,9 @@ package com.normation.cfclerk.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 ordering on TechniqueCategoryId diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueTest.scala index 24c23a87750..3661e7ab6e0 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueTest.scala @@ -38,14 +38,14 @@ package com.normation.cfclerk.domain import com.normation.cfclerk.services.impl.SystemVariableSpecServiceImpl -import com.normation.cfclerk.xmlparsers._ +import com.normation.cfclerk.xmlparsers.* import java.io.FileNotFoundException -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import org.xml.sax.SAXParseException import scala.annotation.nowarn -import scala.xml._ +import scala.xml.* @nowarn("msg=a type was inferred to be `\\w+`; this may indicate a programming error.") @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueVersionTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueVersionTest.scala index a45ca43d69c..60fdfa0395c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueVersionTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/TechniqueVersionTest.scala @@ -42,9 +42,9 @@ import com.normation.utils.PartType import com.normation.utils.Separator import com.normation.utils.Version import com.normation.utils.VersionPart -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class TechniqueVersionTest extends Specification { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala index fd7cf9d632a..446466305c7 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala @@ -37,18 +37,18 @@ package com.normation.cfclerk.domain -import com.normation.cfclerk.domain.HashAlgoConstraint._ -import com.normation.cfclerk.xmlparsers._ +import com.normation.cfclerk.domain.HashAlgoConstraint.* +import com.normation.cfclerk.xmlparsers.* import com.normation.rudder.services.policies.write.CFEngineAgentSpecificGeneration import java.io.FileNotFoundException -import org.joda.time.format._ +import org.joda.time.format.* import org.junit.runner.RunWith import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* import org.xml.sax.SAXParseException import scala.collection.mutable -import scala.xml._ +import scala.xml.* @RunWith(classOf[JUnitRunner]) class VariableTest extends Specification { @@ -159,8 +159,8 @@ class VariableTest extends Specification { gui_only, rawVar ) - variables must haveKeys((1 to 6).map("password" + _): _*) - variables must haveKeys(Seq("", "_AIX").map(s => "password_master" + s): _*) + variables must haveKeys((1 to 6).map("password" + _)*) + variables must haveKeys(Seq("", "_AIX").map(s => "password_master" + s)*) } } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala index d0ae4df2b27..ee7f3ec1a45 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/DummyTechniqueRepository.scala @@ -37,8 +37,8 @@ package com.normation.cfclerk.services -import com.normation.cfclerk.domain._ -import com.normation.errors._ +import com.normation.cfclerk.domain.* +import com.normation.errors.* import com.normation.inventory.domain.AgentType import java.io.InputStream import scala.collection.SortedSet diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala index 18f1a0b19c5..61572e3a649 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitPackageReaderTest.scala @@ -38,7 +38,7 @@ package com.normation.cfclerk.services import com.normation.GitVersion -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.cfclerk.services.impl.GitTechniqueReader import com.normation.cfclerk.services.impl.SystemVariableSpecServiceImpl import com.normation.cfclerk.xmlparsers.SectionSpecParser @@ -46,7 +46,7 @@ import com.normation.cfclerk.xmlparsers.TechniqueParser import com.normation.cfclerk.xmlparsers.VariableSpecParser import com.normation.rudder.git.GitRepositoryProviderImpl import com.normation.rudder.git.SimpleGitRevisionProvider -import com.normation.zio._ +import com.normation.zio.* import java.io.File import java.nio.charset.StandardCharsets import net.liftweb.common.Loggable @@ -59,7 +59,7 @@ import org.specs2.matcher.MatchResult import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner import org.specs2.specification.AfterAll -import zio.syntax._ +import zio.syntax.* /** * Details of tests executed in each instances of diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala index e30f62c3941..a0505f9d6ef 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/JGitRepositoryTest.scala @@ -51,7 +51,7 @@ import com.normation.rudder.git.GitRepositoryProviderImpl import com.normation.rudder.repository.GitModificationRepository import com.normation.rudder.repository.xml.RudderPrettyPrinter import com.normation.rudder.repository.xml.XmlArchiverUtils -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Loggable import org.apache.commons.io.FileUtils import org.eclipse.jgit.lib.PersonIdent @@ -64,8 +64,8 @@ import org.specs2.runner.JUnitRunner import org.specs2.specification.AfterAll import scala.annotation.nowarn import scala.util.Random -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * Details of tests executed in each instances of diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala index 6bd7a561368..9237121686d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala @@ -38,8 +38,8 @@ package com.normation.cfclerk.services import better.files.File -import com.normation.cfclerk.domain._ -import com.normation.errors._ +import com.normation.cfclerk.domain.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.domain.policies.ActiveTechnique @@ -60,7 +60,7 @@ import com.normation.rudder.services.policies.TestNodeConfiguration import com.normation.utils.StringUuidGeneratorImpl import java.nio.charset.Charset import java.nio.charset.StandardCharsets -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.common.Loggable import org.apache.commons.io.FileUtils import org.joda.time.DateTime @@ -69,8 +69,8 @@ import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner import org.specs2.specification.AfterAll import scala.collection.SortedMap -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* @RunWith(classOf[JUnitRunner]) class TechniqueRepositoryTest extends Specification with Loggable with AfterAll { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/ParseTechniqueTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/ParseTechniqueTest.scala index 636bb5b1acc..3c5148b1e63 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/ParseTechniqueTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/ParseTechniqueTest.scala @@ -44,11 +44,11 @@ import com.normation.cfclerk.domain.TechniqueVersionHelper import com.normation.cfclerk.services.impl.SystemVariableSpecServiceImpl import com.normation.inventory.domain.AgentType import java.io.FileNotFoundException -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import org.xml.sax.SAXParseException -import scala.xml._ +import scala.xml.* @RunWith(classOf[JUnitRunner]) class ParseTechniqueTest extends Specification { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala index 9c1e2daa260..0a16a73fb72 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/xmlparsers/TestXmlUtils.scala @@ -38,11 +38,11 @@ package com.normation.cfclerk.xmlparsers import com.normation.cfclerk.domain.LoadTechniqueError -import org.junit.Assert._ +import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner -import scala.xml._ +import scala.xml.* @RunWith(classOf[BlockJUnit4ClassRunner]) class TestXmlUtils { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala index 3fc0685ae1f..8e831d9d956 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala @@ -37,19 +37,19 @@ package com.normation.rudder -import better.files._ +import better.files.* import com.normation.GitVersion -import com.normation.box._ -import com.normation.cfclerk.domain._ -import com.normation.cfclerk.services.impl._ +import com.normation.box.* +import com.normation.cfclerk.domain.* +import com.normation.cfclerk.services.impl.* import com.normation.cfclerk.xmlparsers.SectionSpecParser import com.normation.cfclerk.xmlparsers.TechniqueParser import com.normation.cfclerk.xmlparsers.VariableSpecParser -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.domain.AgentType.CfeCommunity import com.normation.inventory.ldap.core.InventoryDit import com.normation.inventory.ldap.core.InventoryDitService @@ -85,8 +85,8 @@ import com.normation.rudder.domain.NodeDit import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.archives.ParameterArchiveId import com.normation.rudder.domain.archives.RuleArchiveId -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.AddGlobalParameterDiff import com.normation.rudder.domain.properties.DeleteGlobalParameterDiff import com.normation.rudder.domain.properties.GenericProperty.StringToConfigValue @@ -95,7 +95,7 @@ import com.normation.rudder.domain.properties.GroupProperty import com.normation.rudder.domain.properties.InheritMode import com.normation.rudder.domain.properties.ModifyGlobalParameterDiff import com.normation.rudder.domain.properties.PropertyProvider -import com.normation.rudder.domain.queries._ +import com.normation.rudder.domain.queries.* import com.normation.rudder.domain.queries.CriterionComposition import com.normation.rudder.domain.reports.NodeModeConfig import com.normation.rudder.facts.nodes.ChangeContext @@ -117,15 +117,15 @@ import com.normation.rudder.git.GitRepositoryProviderImpl import com.normation.rudder.git.GitRevisionProvider import com.normation.rudder.git.SimpleGitRevisionProvider import com.normation.rudder.migration.XmlEntityMigration -import com.normation.rudder.reports._ -import com.normation.rudder.repository._ +import com.normation.rudder.reports.* +import com.normation.rudder.repository.* import com.normation.rudder.repository.RoRuleRepository import com.normation.rudder.repository.WoRuleRepository import com.normation.rudder.repository.xml.GitParseGroupLibrary import com.normation.rudder.repository.xml.GitParseRules import com.normation.rudder.repository.xml.GitParseTechniqueLibrary import com.normation.rudder.repository.xml.TechniqueRevisionRepository -import com.normation.rudder.rule.category._ +import com.normation.rudder.rule.category.* import com.normation.rudder.services.marshalling.NodeGroupCategoryUnserialisationImpl import com.normation.rudder.services.marshalling.NodeGroupUnserialisationImpl import com.normation.rudder.services.marshalling.RuleUnserialisationImpl @@ -134,7 +134,7 @@ import com.normation.rudder.services.policies.NodeConfiguration import com.normation.rudder.services.policies.ParameterForConfiguration import com.normation.rudder.services.policies.Policy import com.normation.rudder.services.policies.SystemVariableServiceImpl -import com.normation.rudder.services.queries._ +import com.normation.rudder.services.queries.* import com.normation.rudder.services.servers.AllowedNetwork import com.normation.rudder.services.servers.FactListNewNodes import com.normation.rudder.services.servers.NewNodeManager @@ -145,8 +145,8 @@ import com.normation.rudder.services.servers.RelaySynchronizationMethod.Classic import com.normation.rudder.tenants.DefaultTenantService import com.normation.utils.DateFormaterService import com.normation.utils.StringUuidGeneratorImpl -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.RDN import com.unboundid.ldif.LDIFChangeRecord @@ -157,14 +157,14 @@ import org.eclipse.jgit.lib.ObjectId import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat import scala.annotation.tailrec -import scala.collection.immutable.{SortedMap => ISortedMap} +import scala.collection.immutable.SortedMap as ISortedMap import scala.util.control.NonFatal import scala.xml.Elem -import zio.{System => _, Tag => _, _} +import zio.{System as _, Tag as _, *} import zio.json.jsonDiscriminator import zio.json.jsonHint import zio.stream.ZStream -import zio.syntax._ +import zio.syntax.* /* * Mock services for test, especially repositories, and provides @@ -200,7 +200,7 @@ object TestActor { } object revisionRepo { - import com.normation.GitVersion._ + import com.normation.GitVersion.* val revisionsMap: Ref.Synchronized[Map[Revision, RevisionInfo]] = Ref.Synchronized.make(Map[Revision, RevisionInfo]()).runNow @@ -789,7 +789,7 @@ class MockDirectives(mockTechniques: MockTechniques) { } override def activeTechniqueBreadCrump(id: ActiveTechniqueId): IOResult[List[ActiveTechniqueCategory]] = { - import cats.implicits._ + import cats.implicits.* rootActiveTechniqueCategory.get.map(root => { root.fullIndex.find { @@ -1079,7 +1079,7 @@ class MockRules() { object ruleCategoryRepo extends RoRuleCategoryRepository with WoRuleCategoryRepository { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* // returns (parents, rule) if found def recGet(root: RuleCategory, id: RuleCategoryId): Option[(List[RuleCategory], RuleCategory)] = { @@ -1527,10 +1527,10 @@ class MockConfigRepo( } class MockGlobalParam() { - import com.normation.rudder.domain.properties.GenericProperty._ + import com.normation.rudder.domain.properties.GenericProperty.* val mode: InheritMode = { - import com.normation.rudder.domain.properties.InheritMode._ + import com.normation.rudder.domain.properties.InheritMode.* InheritMode(ObjectMode.Override, ArrayMode.Prepend, StringMode.Append) } @@ -1896,7 +1896,7 @@ z5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw== val node2Node: Node = node1Node.copy(id = id2, name = id2.value) val node2: NodeInfo = node1.copy(node = node2Node, hostname = hostname2, policyServerId = root.id) val nodeInventory2: NodeInventory = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* nodeInventory1 .copy() .modify(_.main) @@ -2194,9 +2194,9 @@ class MockNodes() { object queryProcessor extends QueryProcessor { - import cats.implicits._ - import com.normation.inventory.ldap.core.LDAPConstants._ - import com.normation.rudder.domain.RudderLDAPConstants._ + import cats.implicits.* + import com.normation.inventory.ldap.core.LDAPConstants.* + import com.normation.rudder.domain.RudderLDAPConstants.* // return the value to corresponding to the given object/attribute def buildValues(objectName: String, attribute: String): PureResult[NodeFact => List[String]] = { @@ -2461,7 +2461,7 @@ class MockNodeGroups(nodesRepo: MockNodes) { // So, if there is a non-empty list, head is direct parent: replace toAdd in children, then recurse @tailrec def recUpdateCat(toAdd: FullNodeGroupCategory, parents: List[FullNodeGroupCategory]): FullNodeGroupCategory = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* parents match { case Nil => toAdd case p :: pp => @@ -2473,7 +2473,7 @@ class MockNodeGroups(nodesRepo: MockNodes) { } def inDeleteCat(root: FullNodeGroupCategory, id: NodeGroupCategoryId): FullNodeGroupCategory = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* recGetCat(root, id) match { case Some((p :: pp, x)) => recUpdateCat(p.modify(_.subCategories).using(_.filterNot(_.id == id)), pp.reverse) case _ => root @@ -2518,7 +2518,7 @@ class MockNodeGroups(nodesRepo: MockNodes) { group.isEnabled, group.isSystem ) - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* val c = cat.modify(_.targetInfos).using(children => t :: children.filterNot(_.target.target.target == t.target.target.target)) val parents = recGetParent(root, c.id) @@ -2646,7 +2646,7 @@ class MockNodeGroups(nodesRepo: MockNodes) { into: FullNodeGroupCategory, root: FullNodeGroupCategory ): FullNodeGroupCategory = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* val c = into.modify(_.subCategories).using(children => t :: children.filterNot(_.id == t.id)) val parents = recGetParent(root, c.id) recUpdateCat(c, parents) @@ -3003,8 +3003,8 @@ class MockCampaign() { } object dumbCampaignTranslator extends JSONTranslateCampaign { - import com.normation.rudder.campaigns.CampaignSerializer._ - import zio.json._ + import com.normation.rudder.campaigns.CampaignSerializer.* + import zio.json.* implicit val dumbCampaignDetailsDecoder: JsonDecoder[DumbCampaignDetails] = DeriveJsonDecoder.gen implicit val dumbCampaignDecoder: JsonDecoder[DumbCampaignTrait] = DeriveJsonDecoder.gen implicit val dumbCampaignDetailsEncoder: JsonEncoder[DumbCampaignDetails] = DeriveJsonEncoder.gen diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/campaign/CampaignSchedulerTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/campaign/CampaignSchedulerTest.scala index ca6f41aabce..e5ba7e417bd 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/campaign/CampaignSchedulerTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/campaign/CampaignSchedulerTest.scala @@ -47,10 +47,10 @@ import com.normation.rudder.campaigns.Second import com.normation.rudder.campaigns.SecondLast import com.normation.rudder.campaigns.Sunday import com.normation.rudder.campaigns.Third -import com.normation.zio._ +import com.normation.zio.* import org.joda.time.DateTime import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DBCommon.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DBCommon.scala index 8cd1d4d5ce1..501f70a21f3 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DBCommon.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DBCommon.scala @@ -37,15 +37,15 @@ package com.normation.rudder.db -import cats.implicits._ -import com.normation.rudder.db.Doobie._ +import cats.implicits.* +import com.normation.rudder.db.Doobie.* import com.normation.rudder.migration.MigrableEntity import com.normation.rudder.migration.MigrationEventLogRepository import com.normation.rudder.migration.MigrationTestLog import com.normation.rudder.repository.jdbc.RudderDatasourceProvider -import doobie._ -import doobie.implicits._ -import doobie.implicits.javasql._ +import doobie.* +import doobie.implicits.* +import doobie.implicits.javasql.* import java.io.Closeable import java.util.Properties import javax.sql.DataSource @@ -54,8 +54,8 @@ import org.joda.time.DateTime import org.specs2.mutable.Specification import org.specs2.specification.BeforeAfterAll import scala.io.Source -import zio._ -import zio.interop.catz._ +import zio.* +import zio.interop.catz.* /** * Here we manage all the initialisation of services and database diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DoobieIO.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DoobieIO.scala index 562a1cda75e..3ad3f39293a 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DoobieIO.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/DoobieIO.scala @@ -1,6 +1,6 @@ package com.normation.rudder.db -import doobie._ +import doobie.* import javax.sql.DataSource class DoobieIO(dataSource: DataSource) extends Doobie(dataSource) { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/GenerateCompliance.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/GenerateCompliance.scala index 87388bdbb56..d4ee9902f3f 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/GenerateCompliance.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/db/GenerateCompliance.scala @@ -37,19 +37,19 @@ package com.normation.rudder.db -import cats.implicits._ +import cats.implicits.* import com.normation.ldap.sdk.ROPooledSimpleAuthConnectionProvider import com.normation.ldap.sdk.RWPooledSimpleAuthConnectionProvider -import com.normation.rudder.db.Doobie._ +import com.normation.rudder.db.Doobie.* import com.normation.rudder.domain.NodeDit import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.reports.ComplianceLevel import com.normation.rudder.repository.jdbc.RudderDatasourceProvider -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN -import doobie._ -import doobie.implicits._ -import doobie.postgres.implicits._ +import doobie.* +import doobie.implicits.* +import doobie.postgres.implicits.* import java.io.ByteArrayInputStream import java.io.Closeable import java.nio.charset.StandardCharsets @@ -57,7 +57,7 @@ import java.util.Properties import javax.sql.DataSource import org.joda.time.DateTime import scala.util.Random -import zio.interop.catz._ +import zio.interop.catz.* /* * Allow to generate false compliance for testing purpose @@ -404,7 +404,7 @@ object GenerateCompliance { } def main(args: Array[String]): Unit = { - import com.normation.ldap.sdk.BuildFilter._ + import com.normation.ldap.sdk.BuildFilter.* import ch.qos.logback.classic.Level import ch.qos.logback.classic.Logger import org.slf4j.LoggerFactory diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/GenericPropertiesTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/GenericPropertiesTest.scala index 998b0a83850..71cdb12ea4d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/GenericPropertiesTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/GenericPropertiesTest.scala @@ -40,15 +40,15 @@ package com.normation.rudder.domain.nodes import com.normation.BoxSpecMatcher import com.normation.errors.PureResult import com.normation.rudder.domain.properties.GenericProperty -import com.normation.rudder.domain.properties.GenericProperty._ +import com.normation.rudder.domain.properties.GenericProperty.* import com.normation.rudder.domain.properties.NodeProperty import com.typesafe.config.ConfigValueFactory -import java.util.{ArrayList => JList} -import java.util.{HashMap => JMap} -import net.liftweb.common._ +import java.util.ArrayList as JList +import java.util.HashMap as JMap +import net.liftweb.common.* import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class GenericPropertiesTest extends Specification with Loggable with BoxSpecMatcher { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodeKeyHashTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodeKeyHashTest.scala index 82046bd0613..42d53a1d76a 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodeKeyHashTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodeKeyHashTest.scala @@ -38,11 +38,11 @@ package com.normation.rudder.domain.nodes import com.normation.inventory.domain.PublicKey -import com.normation.zio._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.common.* import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class NodeKeyHashTest extends Specification with Loggable { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodePropertiesTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodePropertiesTest.scala index b614a2564f6..8fdafd6a2b2 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodePropertiesTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodePropertiesTest.scala @@ -41,14 +41,14 @@ import com.normation.BoxSpecMatcher import com.normation.errors.PureResult import com.normation.rudder.domain.properties.CompareProperties import com.normation.rudder.domain.properties.GenericProperty -import com.normation.rudder.domain.properties.GenericProperty._ +import com.normation.rudder.domain.properties.GenericProperty.* import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.domain.properties.PropertyProvider import com.typesafe.config.ConfigValue -import net.liftweb.common._ +import net.liftweb.common.* import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class NodePropertiesTest extends Specification with Loggable with BoxSpecMatcher { @@ -129,7 +129,7 @@ class NodePropertiesTest extends Specification with Loggable with BoxSpecMatcher updateAndDelete(NodeProperty("none", "xxx".toConfigValue, None, P2)), updateAndDelete(NodeProperty("default", "xxx".toConfigValue, None, P1)), updateAndDelete(NodeProperty("default", "xxx".toConfigValue, None, P2)) - ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Right[_, _]]).foreach + ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Right[?, ?]]).foreach } "works if providers goes from anything to system" in { @@ -138,7 +138,7 @@ class NodePropertiesTest extends Specification with Loggable with BoxSpecMatcher updateAndDelete(NodeProperty("p1", "xxx".toConfigValue, None, Some(PropertyProvider.systemPropertyProvider))), updateAndDelete(NodeProperty("default", "xxx".toConfigValue, None, Some(PropertyProvider.systemPropertyProvider))), updateAndDelete(NodeProperty("default", "xxx".toConfigValue, None, Some(PropertyProvider.systemPropertyProvider))) - ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Right[_, _]]).foreach + ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Right[?, ?]]).foreach } "fails for different, non default providers" in { @@ -149,14 +149,14 @@ class NodePropertiesTest extends Specification with Loggable with BoxSpecMatcher updateAndDelete(NodeProperty("p2", "xxx".toConfigValue, None, None)), updateAndDelete(NodeProperty("p2", "xxx".toConfigValue, None, RudderP)), updateAndDelete(NodeProperty("p2", "xxx".toConfigValue, None, P1)) - ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Left[_, _]]).foreach + ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Left[?, ?]]).foreach } "be ok with compatible one (default)" in { List( updateAndDelete(NodeProperty("none", "xxx".toConfigValue, None, RudderP)), updateAndDelete(NodeProperty("default", "xxx".toConfigValue, None, None)) - ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Right[_, _]]).foreach + ).flatten must contain((res: PureResult[List[NodeProperty]]) => res must beAnInstanceOf[Right[?, ?]]).foreach } } } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/PolicyModeTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/PolicyModeTest.scala index 37aa972f658..ab3f9a8e0b0 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/PolicyModeTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/PolicyModeTest.scala @@ -39,10 +39,10 @@ package com.normation.rudder.domain.policies import com.normation.rudder.domain.policies.PolicyMode.Audit import com.normation.rudder.domain.policies.PolicyMode.Enforce -import net.liftweb.common._ +import net.liftweb.common.* import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class PolicyModeTest extends Specification with Loggable { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleTargetTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleTargetTest.scala index 4fcd6a16fc3..6ef1d58d552 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleTargetTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleTargetTest.scala @@ -14,11 +14,11 @@ import com.normation.rudder.domain.nodes.NodeInfo import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.reports.ReportingConfiguration import com.normation.rudder.repository.FullNodeGroupCategory -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* import scala.collection.MapView @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/SectionValTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/SectionValTest.scala index 7749fe975a9..ce6730edede 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/SectionValTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/SectionValTest.scala @@ -37,11 +37,11 @@ package com.normation.rudder.domain.policies -import com.normation.cfclerk.domain._ -import net.liftweb.common._ +import com.normation.cfclerk.domain.* +import net.liftweb.common.* import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class SectionValTest extends Specification with Loggable { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/TagsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/TagsTest.scala index ffb4bbf50a9..995b5529195 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/TagsTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/policies/TagsTest.scala @@ -37,19 +37,19 @@ package com.normation.rudder.domain.policies import com.normation.rudder.repository.json.DataExtractor.CompleteJson -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.json.JsonAST.JArray import net.liftweb.json.JsonAST.JField import net.liftweb.json.JsonAST.JObject import net.liftweb.json.JsonAST.JString import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class TagsTest extends Specification with Loggable { def createTag(name: String): Tag = { - import Tag._ + import Tag.* Tag(name, name + "-value") } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/properties/NodePropertiesTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/properties/NodePropertiesTest.scala index 03e895c4b2d..86a04b5da4a 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/properties/NodePropertiesTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/properties/NodePropertiesTest.scala @@ -37,10 +37,10 @@ package com.normation.rudder.domain.properties -import net.liftweb.common._ +import net.liftweb.common.* import org.junit.runner.RunWith -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* /* * Our internal representation of node properties must correctly serialize/unserialise to JSON diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/CmdbQueryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/CmdbQueryTest.scala index 2f6d8a180c7..7c4398a5d65 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/CmdbQueryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/CmdbQueryTest.scala @@ -1,7 +1,7 @@ package com.normation.rudder.domain.queries import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/JsonSelectTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/JsonSelectTest.scala index 2a42a0b2030..3a03a5a7bc8 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/JsonSelectTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/queries/JsonSelectTest.scala @@ -38,10 +38,10 @@ package com.normation.rudder.domain.queries import com.normation.BoxSpecMatcher -import net.liftweb.common._ -import net.liftweb.json._ +import net.liftweb.common.* +import net.liftweb.json.* import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/ExpectedReportTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/ExpectedReportTest.scala index b45109d56cc..56e4cc747d9 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/ExpectedReportTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/ExpectedReportTest.scala @@ -37,7 +37,7 @@ package com.normation.rudder.domain.reports -import better.files._ +import better.files.* import com.normation.GitVersion import com.normation.cfclerk.domain.ReportingLogic import com.normation.rudder.domain.policies.DirectiveId @@ -47,7 +47,7 @@ import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.policies.PolicyModeOverrides import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.policies.RuleUid -import com.normation.rudder.domain.reports.ExpectedReportsSerialisation._ +import com.normation.rudder.domain.reports.ExpectedReportsSerialisation.* import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.reports.FullCompliance import com.normation.rudder.reports.GlobalComplianceMode @@ -77,8 +77,8 @@ class ExpectedReportTest extends Specification { sequential "Just a block" >> { - import zio.json._ - import ExpectedReportsSerialisation.Version7_1._ + import zio.json.* + import ExpectedReportsSerialisation.Version7_1.* val jsonMin = { """ { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/StatusReportTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/StatusReportTest.scala index 7746ca77c10..a3f4c50ad9a 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/StatusReportTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/reports/StatusReportTest.scala @@ -43,7 +43,7 @@ import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.policies.RuleUid -import com.normation.rudder.domain.reports.ReportType._ +import com.normation.rudder.domain.reports.ReportType.* import com.normation.rudder.services.policies.NodeConfigData import com.normation.rudder.services.reports.Pending import org.joda.time.DateTime diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala index 4087150106b..f5b47b1e4b5 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala @@ -37,14 +37,14 @@ package com.normation.rudder.facts.nodes -import better.files._ +import better.files.* import com.normation.inventory.ldap.core.FullInventoryRepositoryImpl import com.normation.inventory.ldap.core.InventoryDit import com.normation.inventory.ldap.core.InventoryDitService import com.normation.inventory.ldap.core.InventoryDitServiceImpl import com.normation.inventory.ldap.core.InventoryMapper import com.normation.inventory.ldap.core.ReadOnlySoftwareDAOImpl -import com.normation.inventory.ldap.provisioning._ +import com.normation.inventory.ldap.provisioning.* import com.normation.ldap.ldif.DefaultLDIFFileLogger import com.normation.ldap.listener.InMemoryDsConnectionProvider import com.normation.ldap.sdk.LDAPConnectionProvider diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala index 3855c7a1c52..ac001128a75 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala @@ -37,11 +37,11 @@ package com.normation.rudder.facts.nodes -import better.files._ -import com.normation.errors._ +import better.files.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.ldap.core.InventoryDit import com.normation.inventory.ldap.core.ReadOnlySoftwareDAOImpl import com.normation.rudder.domain.Constants @@ -49,21 +49,21 @@ import com.normation.rudder.domain.nodes.MachineInfo import com.normation.rudder.tenants.DefaultTenantService import com.normation.rudder.tenants.TenantId import com.normation.utils.DateFormaterService -import com.normation.zio._ +import com.normation.zio.* import com.normation.zio.ZioRuntime -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import com.unboundid.ldap.sdk.SearchScope import java.security.Security import org.apache.commons.io.FileUtils import org.bouncycastle.jce.provider.BouncyCastleProvider import org.joda.time.DateTime -import org.junit.runner._ +import org.junit.runner.* import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* import org.specs2.specification.BeforeAfterAll import scala.annotation.nowarn -import zio._ +import zio.* /** * @@ -292,7 +292,7 @@ class TestCoreNodeFactInventory extends Specification with BeforeAfterAll { ) and (node.software.size === 1) and (node.software.head === SoftwareFact("Software 0", new Version("1.0.0"))) and - (node7UndefinedElements(node) must contain((x: Chunk[_]) => x must beEmpty).foreach) + (node7UndefinedElements(node) must contain((x: Chunk[?]) => x must beEmpty).foreach) } @@ -318,7 +318,7 @@ class TestCoreNodeFactInventory extends Specification with BeforeAfterAll { (node.fileSystems.size === 0) and (node.software.size === 1) and (node.software.head === SoftwareFact("Software 0", new Version("1.0.0"))) and - (node7UndefinedElements(node) must contain((x: Chunk[_]) => x must beEmpty).foreach) + (node7UndefinedElements(node) must contain((x: Chunk[?]) => x must beEmpty).foreach) } // for now, we can't selectively choose what sub element of inventory we retrieve. It could be done if needed @@ -340,7 +340,7 @@ class TestCoreNodeFactInventory extends Specification with BeforeAfterAll { ) and (node.fileSystems.size === 0) and (node.software.size === 0) and - (node7UndefinedElements(node) must contain((x: Chunk[_]) => x must beEmpty).foreach) + (node7UndefinedElements(node) must contain((x: Chunk[?]) => x must beEmpty).foreach) } } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestFullInventoryRepoProxy.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestFullInventoryRepoProxy.scala index 3bddd28f162..a51f160a49f 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestFullInventoryRepoProxy.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestFullInventoryRepoProxy.scala @@ -37,20 +37,20 @@ package com.normation.rudder.facts.nodes -import com.normation.errors._ -import com.normation.inventory.domain._ +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.inventory.services.core.FullInventoryRepository import com.normation.rudder.tenants.DefaultTenantService -import com.normation.zio._ +import com.normation.zio.* import com.normation.zio.ZioRuntime -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import org.joda.time.DateTime -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ -import zio._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* +import zio.* import zio.concurrent.ReentrantLock -import zio.syntax._ +import zio.syntax.* final case class SystemError(cause: Throwable) extends RudderError { def msg = "Error in test" @@ -382,8 +382,8 @@ class TestFullInventoryRepoProxy extends Specification { s"""{"name":"app2","version":"1-24-RELEASE-64","arch":"x86_64","from":"apt","kind":"security","source":"security-backports","severity":"backport","ids":["${id1}"]}""" ).mkString("[", ",", "]") - import zio.json._ - import JsonSerializers.implicits._ + import zio.json.* + import JsonSerializers.implicits.* updates.toJson === jsonString } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala index 77e18253a6e..118bc23d235 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala @@ -37,12 +37,12 @@ package com.normation.rudder.facts.nodes -import better.files._ +import better.files.* import com.normation.box.IOManaged -import com.normation.errors._ -import com.normation.inventory.domain._ +import com.normation.errors.* +import com.normation.inventory.domain.* import com.normation.inventory.ldap.core.InventoryDit -import com.normation.inventory.ldap.provisioning._ +import com.normation.inventory.ldap.provisioning.* import com.normation.inventory.provisioning.fusion.FusionInventoryParser import com.normation.inventory.provisioning.fusion.PreInventoryParserCheckConsistency import com.normation.inventory.services.provisioning.DefaultInventoryParser @@ -64,9 +64,9 @@ import com.normation.rudder.inventory.SaveInventoryInfo import com.normation.rudder.tenants.DefaultTenantService import com.normation.utils.DateFormaterService import com.normation.utils.StringUuidGeneratorImpl -import com.normation.zio._ +import com.normation.zio.* import com.normation.zio.ZioRuntime -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import com.typesafe.config.ConfigValueFactory import cron4s.Cron import java.io.InputStream @@ -74,15 +74,15 @@ import java.security.Security import org.apache.commons.io.FileUtils import org.bouncycastle.jce.provider.BouncyCastleProvider import org.joda.time.DateTime -import org.junit.runner._ +import org.junit.runner.* import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* import org.specs2.specification.BeforeAfterAll import scala.annotation.nowarn -import zio._ +import zio.* import zio.concurrent.ReentrantLock -import zio.syntax._ +import zio.syntax.* /** * diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSelectFacts.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSelectFacts.scala index a3e740c8a47..9e5737e377f 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSelectFacts.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSelectFacts.scala @@ -46,10 +46,10 @@ import com.normation.inventory.domain.Manufacturer import com.normation.inventory.domain.VirtualMachineType import com.normation.inventory.domain.VmType import com.normation.rudder.MockNodes -import com.softwaremill.quicklens._ -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import com.softwaremill.quicklens.* +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import zio.Chunk /* @@ -58,7 +58,7 @@ import zio.Chunk //@silent("a type was inferred to be `\\w+`; this may indicate a programming error.") @RunWith(classOf[JUnitRunner]) class TestSelectFacts extends Specification { - import MockNodes._ + import MockNodes.* val machine1: MachineInventory = MachineInventory( MachineUuid("machine1"), diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/HooksTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/HooksTest.scala index e30d2c12401..01c700e9159 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/HooksTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/HooksTest.scala @@ -37,7 +37,7 @@ package com.normation.rudder.hooks -import better.files._ +import better.files.* import com.normation.rudder.hooks.HookReturnCode.Ok import com.normation.rudder.hooks.HookReturnCode.ScriptError import com.normation.rudder.hooks.HookReturnCode.SystemError @@ -49,8 +49,8 @@ import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner import org.specs2.specification.AfterAll -import scala.jdk.CollectionConverters._ -import zio.{System => _, _} +import scala.jdk.CollectionConverters.* +import zio.{System as _, *} /** * Test properties about NuProcess command, especially about diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/RunNuCommandTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/RunNuCommandTest.scala index e320916f3bb..c47e7794592 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/RunNuCommandTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/hooks/RunNuCommandTest.scala @@ -37,8 +37,8 @@ package com.normation.rudder.hooks -import com.normation.errors._ -import com.normation.zio._ +import com.normation.errors.* +import com.normation.zio.* import java.io.File import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat @@ -46,8 +46,8 @@ import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner import scala.annotation.nowarn -import scala.jdk.CollectionConverters._ -import zio.{System => _, _} +import scala.jdk.CollectionConverters.* +import zio.{System as _, *} /** * Test properties about NuProcess command, especially about diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/NodeCountHistorizationTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/NodeCountHistorizationTest.scala index 7c0f83141a1..90aea0677eb 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/NodeCountHistorizationTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/NodeCountHistorizationTest.scala @@ -37,7 +37,7 @@ package com.normation.rudder.metrics -import better.files._ +import better.files.* import com.normation.errors import com.normation.errors.IOResult import com.normation.zio.ZioRuntime @@ -46,10 +46,10 @@ import org.joda.time.DateTime import org.joda.time.DateTimeZone import org.joda.time.format.ISODateTimeFormat import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner -import zio.{System => _, _} -import zio.test._ +import zio.{System as _, *} +import zio.test.* @RunWith(classOf[JUnitRunner]) class NodeCountHistorizationTest extends Specification with BeforeAfter { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/SchedulerTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/SchedulerTest.scala index 7c0aba36f18..adea674d566 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/SchedulerTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/metrics/SchedulerTest.scala @@ -40,10 +40,10 @@ package com.normation.rudder.metrics import com.normation.zio.ZioRuntime import java.util.concurrent.TimeUnit import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner -import zio.{Scheduler => _, _} -import zio.test._ +import zio.{Scheduler as _, *} +import zio.test.* @RunWith(classOf[JUnitRunner]) class SchedulerTest extends Specification { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala index 9e08c07612f..b1c3a4a6844 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestDbMigration.scala @@ -38,9 +38,9 @@ package com.normation.rudder.migration import com.normation.rudder.db.DBCommon -import com.normation.rudder.db.Doobie._ -import doobie.implicits._ -import doobie.implicits.javasql._ +import com.normation.rudder.db.Doobie.* +import doobie.implicits.* +import doobie.implicits.javasql.* import java.sql.Connection import java.sql.Timestamp import net.liftweb.common.Failure @@ -49,7 +49,7 @@ import org.specs2.matcher.XmlMatchers import org.specs2.runner.JUnitRunner import scala.annotation.nowarn import scala.xml.Elem -import zio.interop.catz._ +import zio.interop.catz.* final case class MigEx102(msg: String) extends Exception(msg) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala index a572b796f85..963265a69a1 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestManageMigration.scala @@ -39,11 +39,11 @@ package com.normation.rudder.migration import com.normation.BoxSpecMatcher import com.normation.rudder.db.DBCommon -import doobie.implicits._ +import doobie.implicits.* import org.joda.time.DateTime import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner -import zio.interop.catz._ +import zio.interop.catz.* /** * Test how the migration run with a Database context diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestXmlMigration.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestXmlMigration.scala index ea04f7295bb..255a33f2f61 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestXmlMigration.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/TestXmlMigration.scala @@ -37,10 +37,10 @@ package com.normation.rudder.migration -import Migration_5_DATA_ChangeRequest._ -import Migration_5_DATA_Rule._ -import Migration_6_DATA_ChangeRequest._ -import Migration_6_DATA_Rule._ +import Migration_5_DATA_ChangeRequest.* +import Migration_5_DATA_Rule.* +import Migration_6_DATA_ChangeRequest.* +import Migration_6_DATA_Rule.* import net.liftweb.common.Box import net.liftweb.common.Full import net.liftweb.common.Loggable diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_5.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_5.scala index 40f9429df06..fbf651d5bea 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_5.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_5.scala @@ -40,7 +40,7 @@ package com.normation.rudder.migration import scala.xml.Elem object DATA_5 { - import Migration_5_DATA_Rule._ + import Migration_5_DATA_Rule.* def e(xml: Elem): Elem = {xml} diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_6.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_6.scala index 0da9e5ec237..ce4eb3135f0 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_6.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/migration/XMLDataMigration_6.scala @@ -40,7 +40,7 @@ package com.normation.rudder.migration import scala.xml.Elem object DATA_6 { - import Migration_6_DATA_Rule._ + import Migration_6_DATA_Rule.* def e(xml: Elem): Elem = {xml} diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestDecodeNcfMethodLib.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestDecodeNcfMethodLib.scala index 3f628857b1e..4b7dc800d5e 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestDecodeNcfMethodLib.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestDecodeNcfMethodLib.scala @@ -39,7 +39,7 @@ package com.normation.rudder.ncf import better.files.Resource import com.normation.rudder.ncf.ParameterType.PlugableParameterTypeService -import com.normation.zio._ +import com.normation.zio.* import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala index 3e2c32e72dc..400f0c37642 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala @@ -52,7 +52,7 @@ import com.normation.cfclerk.services.TechniquesInfo import com.normation.cfclerk.services.TechniquesLibraryUpdateNotification import com.normation.cfclerk.services.TechniquesLibraryUpdateType import com.normation.cfclerk.services.UpdateTechniqueLibrary -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.AgentType @@ -87,8 +87,8 @@ import com.normation.rudder.services.workflows.NodeGroupChangeRequest import com.normation.rudder.services.workflows.RuleChangeRequest import com.normation.rudder.services.workflows.WorkflowLevelService import com.normation.rudder.services.workflows.WorkflowService -import com.normation.zio._ -import java.io.{File => JFile} +import com.normation.zio.* +import java.io.File as JFile import java.io.InputStream import net.liftweb.common.Box import net.liftweb.common.Full @@ -102,8 +102,8 @@ import org.specs2.runner.JUnitRunner import org.specs2.specification.BeforeAfterAll import scala.collection.SortedMap import scala.collection.SortedSet -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* @RunWith(classOf[JUnitRunner]) class TestEditorTechniqueWriter extends Specification with ContentMatchers with Loggable with BeforeAfterAll { @@ -328,7 +328,7 @@ class TestEditorTechniqueWriter extends Specification with ContentMatchers with val valueCompiler = new InterpolatedValueCompilerImpl(propertyEngineService) val parameterTypeService: PlugableParameterTypeService = new PlugableParameterTypeService - import ParameterType._ + import ParameterType.* val defaultConstraint: List[Constraint.Constraint] = Constraint.AllowEmpty(false) :: Constraint.AllowWhiteSpace(false) :: Constraint.MaxLength(16384) :: Nil val methods: Map[BundleName, GenericMethod] = (GenericMethod( diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala index 4257eb5c88c..7cbcff83b18 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriterFallback.scala @@ -38,19 +38,19 @@ package com.normation.rudder.ncf import better.files.File -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.AgentType import com.normation.inventory.domain.Version import com.normation.rudder.domain.policies.PolicyMode.Enforce import com.normation.rudder.hooks.CmdResult import com.normation.rudder.ncf.ParameterType.PlugableParameterTypeService -import com.normation.rudder.ncf.TechniqueCompilerApp._ +import com.normation.rudder.ncf.TechniqueCompilerApp.* import com.normation.rudder.repository.xml.RudderPrettyPrinter import com.normation.rudder.services.nodes.PropertyEngineServiceImpl import com.normation.rudder.services.policies.InterpolatedValueCompilerImpl -import com.normation.zio._ -import com.softwaremill.quicklens._ -import java.io.{File => JFile} +import com.normation.zio.* +import com.softwaremill.quicklens.* +import java.io.File as JFile import net.liftweb.common.Loggable import org.apache.commons.io.FileUtils import org.joda.time.DateTime @@ -62,7 +62,7 @@ import org.specs2.runner.JUnitRunner import org.specs2.specification.BeforeAfterAll import scala.annotation.nowarn import zio.Chunk -import zio.syntax._ +import zio.syntax.* /* * Test the fallback logic for the technique writer @@ -93,7 +93,7 @@ class TestEditorTechniqueWriterFallback extends Specification with ContentMatche case object CreatedByRudderc extends OutputFileStatus case object CreatedByWebapp extends OutputFileStatus } - import OutputFileStatus._ + import OutputFileStatus.* object Content { val ruddercMetadata = "I'm not really an XML" @@ -173,7 +173,7 @@ class TestEditorTechniqueWriterFallback extends Specification with ContentMatche val valueCompiler = new InterpolatedValueCompilerImpl(new PropertyEngineServiceImpl(List.empty)) val parameterTypeService = new PlugableParameterTypeService - import ParameterType._ + import ParameterType.* val defaultConstraint: List[Constraint.Constraint] = Constraint.AllowEmpty(false) :: Constraint.AllowWhiteSpace(false) :: Constraint.MaxLength(16384) :: Nil @@ -395,8 +395,8 @@ class TestEditorTechniqueWriterFallback extends Specification with ContentMatche } s"Compiler WITH local compilation override" should { - import zio.json.yaml._ - import TechniqueCompilationIO._ + import zio.json.yaml.* + import TechniqueCompilationIO.* val rootPath = basePath + "/override" implicit val compiler = newCompilerWithBase(rootPath) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepositoryTest.scala index 1b3d1dbcd48..32b1c441611 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/EventLogJdbcRepositoryTest.scala @@ -38,8 +38,8 @@ package com.normation.rudder.repository.jdbc import com.normation.rudder.db.DBCommon -import com.normation.rudder.domain.eventlog._ -import doobie._ +import com.normation.rudder.domain.eventlog.* +import doobie.* import doobie.specs2.analysisspec.IOChecker import org.junit.runner.RunWith import org.specs2.mutable.Specification diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala index 99a07beaf8c..1a179f91c36 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/GitModificationRepositoryTest.scala @@ -37,19 +37,19 @@ package com.normation.rudder.repository.jdbc -import cats.implicits._ +import cats.implicits.* import com.normation.BoxSpecMatcher -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.ModificationId import com.normation.rudder.db.DB import com.normation.rudder.db.DBCommon import com.normation.rudder.git.GitCommitId -import com.normation.zio._ -import doobie.implicits._ +import com.normation.zio.* +import doobie.implicits.* import net.liftweb.common.Box import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner -import zio.interop.catz._ +import zio.interop.catz.* /** * diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportExecutionTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportExecutionTest.scala index 8b9f9ffa32d..21afb61836c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportExecutionTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportExecutionTest.scala @@ -38,17 +38,17 @@ package com.normation.rudder.repository.jdbc import com.normation.BoxSpecMatcher -import com.normation.box._ +import com.normation.box.* import com.normation.inventory.domain.NodeId import com.normation.rudder.db.DB import com.normation.rudder.db.DBCommon import com.normation.rudder.reports.execution.RoReportsExecutionRepositoryImpl import com.normation.rudder.reports.execution.WoReportsExecutionRepositoryImpl -import doobie.implicits._ +import doobie.implicits.* import org.joda.time.DateTime import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner -import zio.interop.catz._ +import zio.interop.catz.* /** * diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala index 074d0d05fe6..1a91869ef2e 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportingServiceTest.scala @@ -41,16 +41,16 @@ import com.normation.BoxSpecMatcher import com.normation.GitVersion import com.normation.cfclerk.domain.Technique import com.normation.cfclerk.domain.TechniqueName -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.db.DB import com.normation.rudder.db.DBCommon -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.domain.policies.GlobalPolicyMode import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.facts.nodes.CoreNodeFactRepository import com.normation.rudder.facts.nodes.NodeFactRepository import com.normation.rudder.facts.nodes.NoopFactStorage @@ -60,7 +60,7 @@ import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.reports.AgentRunIntervalService import com.normation.rudder.reports.GlobalComplianceMode import com.normation.rudder.reports.ResolvedAgentRunInterval -import com.normation.rudder.reports.execution._ +import com.normation.rudder.reports.execution.* import com.normation.rudder.repository.CategoryWithActiveTechniques import com.normation.rudder.repository.ComplianceRepository import com.normation.rudder.repository.FullActiveTechniqueCategory @@ -77,9 +77,9 @@ import com.normation.rudder.services.reports.NodeConfigurationServiceImpl import com.normation.rudder.services.reports.ReportingServiceImpl import com.normation.rudder.services.reports.UnexpectedReportInterpretation import com.normation.rudder.tenants.DefaultTenantService -import com.normation.zio._ -import com.softwaremill.quicklens._ -import doobie.implicits._ +import com.normation.zio.* +import com.softwaremill.quicklens.* +import doobie.implicits.* import net.liftweb.common.Box import net.liftweb.common.Empty import net.liftweb.common.Full @@ -90,9 +90,9 @@ import org.specs2.runner.JUnitRunner import scala.annotation.nowarn import scala.collection.SortedMap import scala.concurrent.duration.FiniteDuration -import zio._ -import zio.interop.catz._ -import zio.syntax._ +import zio.* +import zio.interop.catz.* +import zio.syntax.* /** * diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsProgressTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsProgressTest.scala index 8044a10f4ed..2f2d5bb2926 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsProgressTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsProgressTest.scala @@ -41,11 +41,11 @@ import com.normation.BoxSpecMatcher import com.normation.rudder.db.DB.StatusUpdate import com.normation.rudder.db.DBCommon import com.normation.rudder.reports.execution.LastProcessedReportRepositoryImpl -import doobie.implicits._ +import doobie.implicits.* import org.joda.time.DateTime import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner -import zio.interop.catz._ +import zio.interop.catz.* /** * diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala index ddd9b65aef7..d25291f2cbe 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/jdbc/ReportsTest.scala @@ -37,7 +37,7 @@ package com.normation.rudder.repository.jdbc -import cats.implicits._ +import cats.implicits.* import com.normation.inventory.domain.NodeId import com.normation.rudder.db.DB import com.normation.rudder.db.DBCommon @@ -49,12 +49,12 @@ import com.normation.rudder.domain.reports.NodeConfigId import com.normation.rudder.domain.reports.Reports import com.normation.rudder.reports.execution.AgentRun import com.normation.rudder.reports.execution.AgentRunId -import doobie.implicits._ -import net.liftweb.common._ +import doobie.implicits.* +import net.liftweb.common.* import org.joda.time.DateTime import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner -import zio.interop.catz._ +import zio.interop.catz.* /** * @@ -204,7 +204,7 @@ class ReportsTest extends DBCommon { val checkInsert = transacRun(xa => sql"""select id from ruddersysevents""".query[Long].to[Vector].transact(xa)).size (checkInsert must beEqualTo(14)) and - (res._1 must contain(exactly(expected: _*))) + (res._1 must contain(exactly(expected*))) } } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/CheckNormationOidTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/CheckNormationOidTest.scala index 5ad981b6772..0f8c9e9467d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/CheckNormationOidTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/CheckNormationOidTest.scala @@ -37,9 +37,9 @@ package com.normation.rudder.repository.ldap -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import scala.util.matching.Regex /** diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala index 29506129644..a6e788cdf90 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala @@ -46,8 +46,8 @@ import com.normation.inventory.ldap.core.InventoryMapper import com.normation.ldap.sdk.LDAPEntry import com.normation.rudder.domain.NodeDit import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ -import com.normation.rudder.domain.properties.GenericProperty._ +import com.normation.rudder.domain.RudderLDAPConstants.* +import com.normation.rudder.domain.properties.GenericProperty.* import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.queries.ObjectCriterion import com.normation.rudder.services.queries.CmdbQueryParser @@ -55,9 +55,9 @@ import com.normation.rudder.services.queries.DefaultStringQueryParser import com.normation.rudder.services.queries.JsonQueryLexer import com.typesafe.config.ConfigValueType import com.unboundid.ldap.sdk.DN -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* /** * A test that checks that an global parameter in 6.0 is correctly parsed as a string in diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala index e7bf6330ae2..76803934887 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/InventoryNodeInfoCompatTest.scala @@ -54,12 +54,12 @@ import com.normation.rudder.domain.queries.ObjectCriterion import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.rudder.services.queries.DefaultStringQueryParser import com.normation.rudder.services.queries.JsonQueryLexer -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.Entry -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* /** * A test to check that an node inventory entry @@ -209,7 +209,7 @@ class InventoryNodeInfoCompatTest extends Specification { } def node(ldif: String): NodeInfo = { - val nodeEntry = new LDAPEntry(new Entry(ldif.split("\n").toSeq: _*)) + val nodeEntry = new LDAPEntry(new Entry(ldif.split("\n").toSeq*)) mapper.convertEntriesToSpecialNodeInfos(nodeEntry, None).runNow } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LoadDemoDataTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LoadDemoDataTest.scala index 9c24a4c789b..c46ac549fe5 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LoadDemoDataTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LoadDemoDataTest.scala @@ -41,9 +41,9 @@ import com.normation.ldap.ldif.DummyLDIFFileLogger import com.normation.ldap.listener.InMemoryDsConnectionProvider import com.normation.ldap.sdk.RoLDAPConnection import com.normation.ldap.sdk.RwLDAPConnection -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* /** * A simple test class to check that the demo data file is up to date diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/xml/TestGitFindUtils.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/xml/TestGitFindUtils.scala index 56da5ea204f..efb2db2a553 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/xml/TestGitFindUtils.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/xml/TestGitFindUtils.scala @@ -37,10 +37,10 @@ package com.normation.rudder.repository.xml -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.git.GitFindUtils import com.normation.rudder.git.ZipUtils -import com.normation.zio._ +import com.normation.zio.* import java.io.File import java.nio.charset.StandardCharsets import java.util.zip.ZipFile @@ -127,31 +127,31 @@ class TestGitFindUtils extends Specification with Loggable with AfterAll with Co "the walk" should { "return all results when no filter provided" in { - list(Nil, Nil) must contain(exactly(allPaths: _*)) + list(Nil, Nil) must contain(exactly(allPaths*)) } "return all results when all dir are provided as filter" in { - list(List("a", "b", "x"), Nil) must contain(exactly(allPaths: _*)) + list(List("a", "b", "x"), Nil) must contain(exactly(allPaths*)) } "return all results when all extension are provided" in { - list(Nil, List("pdf", "txt", "plop")) must contain(exactly(allPaths: _*)) + list(Nil, List("pdf", "txt", "plop")) must contain(exactly(allPaths*)) } "return only files under a when filter for 'a'" in { - list(List("a"), Nil) must contain(exactly(allDirA: _*)) + list(List("a"), Nil) must contain(exactly(allDirA*)) } "return only files under a when filter for a/" in { - list(List("a/"), Nil) must contain(exactly(allDirA: _*)) + list(List("a/"), Nil) must contain(exactly(allDirA*)) } "return only files under a when filter for a/a" in { - list(List("a/a"), Nil) must contain(exactly(allDirAA: _*)) + list(List("a/a"), Nil) must contain(exactly(allDirAA*)) } "return only files under a when filter for 'b'" in { - list(List("b"), Nil) must contain(exactly(allDirB: _*)) + list(List("b"), Nil) must contain(exactly(allDirB*)) } "return both files under 'a' and 'b'" in { @@ -159,7 +159,7 @@ class TestGitFindUtils extends Specification with Loggable with AfterAll with Co } "return all .txt" in { - list(Nil, List(".txt")) must contain(exactly(allTxt: _*)) + list(Nil, List(".txt")) must contain(exactly(allTxt*)) } "return all .txt and .pdf" in { @@ -167,7 +167,7 @@ class TestGitFindUtils extends Specification with Loggable with AfterAll with Co } "return x/f.txt/f.txt" in { - list(List("x"), List(".txt")) must contain(exactly(allDirX: _*)) + list(List("x"), List(".txt")) must contain(exactly(allDirX*)) } "return nothing" in { @@ -175,11 +175,11 @@ class TestGitFindUtils extends Specification with Loggable with AfterAll with Co } "ignore empty path" in { - list(List("x", ""), Nil) must contain(exactly(allDirX: _*)) + list(List("x", ""), Nil) must contain(exactly(allDirX*)) } "ignore empty extension" in { - list(Nil, List("txt", "")) must contain(exactly(allTxt: _*)) + list(Nil, List("txt", "")) must contain(exactly(allTxt*)) } } @@ -202,7 +202,7 @@ class TestGitFindUtils extends Specification with Loggable with AfterAll with Co // all modification def allModif(s: Status): List[String] = { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* List( s.getAdded, s.getChanged, diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/eventlog/NodeEventLogFormatV6Test.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/eventlog/NodeEventLogFormatV6Test.scala index 7360a6e8aa8..f29c3c1d4d1 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/eventlog/NodeEventLogFormatV6Test.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/eventlog/NodeEventLogFormatV6Test.scala @@ -42,7 +42,7 @@ import com.normation.rudder.domain.eventlog.EventTypeFactory import com.normation.rudder.domain.eventlog.ModifyNodeEventType import com.normation.rudder.domain.nodes.ModifyNodeDiff import com.normation.rudder.domain.policies.SimpleDiff -import com.normation.rudder.domain.properties.GenericProperty._ +import com.normation.rudder.domain.properties.GenericProperty.* import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.reports.HeartbeatConfiguration diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala index 8dab6480437..9a556740cac 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala @@ -15,9 +15,9 @@ import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.domain.policies.SectionVal import com.normation.rudder.domain.policies.Tags import com.normation.rudder.domain.properties.GroupProperty -import com.normation.rudder.domain.queries._ +import com.normation.rudder.domain.queries.* import com.normation.rudder.domain.queries.ObjectCriterion -import com.normation.rudder.domain.queries.ResultTransformation._ +import com.normation.rudder.domain.queries.ResultTransformation.* import com.normation.rudder.services.policies.TestNodeConfiguration import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.rudder.services.queries.DefaultStringQueryParser diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala index 46863c1b7d8..9c65660803e 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala @@ -40,7 +40,7 @@ package com.normation.rudder.services.nodes import com.normation.GitVersion import com.normation.errors.PureResult import com.normation.errors.RudderError -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.policies.FullGroupTarget import com.normation.rudder.domain.policies.FullRuleTargetInfo import com.normation.rudder.domain.policies.GroupTarget @@ -48,21 +48,21 @@ import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.properties.GroupProperty import com.normation.rudder.domain.properties.InheritMode -import com.normation.rudder.domain.properties.JsonPropertySerialisation._ +import com.normation.rudder.domain.properties.JsonPropertySerialisation.* import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.domain.properties.NodePropertyHierarchy import com.normation.rudder.domain.properties.ParentProperty -import com.normation.rudder.domain.queries._ -import com.normation.rudder.domain.queries.ResultTransformation._ +import com.normation.rudder.domain.queries.* +import com.normation.rudder.domain.queries.ResultTransformation.* import com.normation.rudder.services.policies.NodeConfigData -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import com.typesafe.config.ConfigValue import com.typesafe.config.ConfigValueFactory -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* /* * This class test the JsEngine. 6.0 diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala index 1d631f4cb50..389ae398c90 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/history/impl/TestFileHistoryLogRepository.scala @@ -20,17 +20,17 @@ package com.normation.rudder.services.nodes.history.impl -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.RudderError import com.normation.zio.ZioRuntime import java.io.File import org.apache.commons.io.FileUtils import org.joda.time.DateTime -import org.junit._ -import org.junit.Assert._ +import org.junit.* +import org.junit.Assert.* import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner -import zio._ +import zio.* final case class SystemError(cause: Throwable) extends RudderError { def msg = "Error in test" @@ -50,7 +50,7 @@ object StringId extends IdToFilenameConverter[String] { override def filenameToId(name: String): String = name } -import TestFileHistoryLogRepository._ +import TestFileHistoryLogRepository.* @RunWith(classOf[BlockJUnit4ClassRunner]) class TestFileHistoryLogRepository { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala index fef650f811d..25a2e102f63 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala @@ -78,7 +78,7 @@ import com.normation.inventory.domain.PublicKey import com.normation.inventory.domain.UndefinedKey import com.normation.inventory.domain.Version import com.normation.inventory.domain.VirtualMachineType -import com.normation.inventory.domain.VmType._ +import com.normation.inventory.domain.VmType.* import com.normation.inventory.domain.Windows import com.normation.inventory.domain.Windows2012 import com.normation.rudder.domain.Constants @@ -119,7 +119,7 @@ import com.normation.rudder.facts.nodes.RudderSettings import com.normation.rudder.git.GitRepositoryProviderImpl import com.normation.rudder.git.GitRevisionProvider import com.normation.rudder.git.SimpleGitRevisionProvider -import com.normation.rudder.reports._ +import com.normation.rudder.reports.* import com.normation.rudder.repository.FullActiveTechnique import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.repository.FullNodeGroupCategory @@ -133,8 +133,8 @@ import com.normation.rudder.services.servers.PolicyServers import com.normation.rudder.services.servers.PolicyServersUpdateCommand import com.normation.rudder.services.servers.RelaySynchronizationMethod.Classic import com.normation.utils.StringUuidGeneratorImpl -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import java.io.File import java.nio.file.Files import java.nio.file.FileSystemNotFoundException @@ -151,7 +151,7 @@ import org.joda.time.DateTime import scala.collection.MapView import scala.collection.SortedMap import zio.Chunk -import zio.syntax._ +import zio.syntax.* /* * This file is a container for testing data that are a little boring to @@ -197,7 +197,7 @@ object NodeConfigData { val uri = this.getClass.getClassLoader.getResource(name).toURI val path = uri.getScheme match { case "jar" => - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* // yes, pur side effecting try { FileSystems.getFileSystem(uri) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeExpectedReportTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeExpectedReportTest.scala index ed11df09011..1a79055ba2d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeExpectedReportTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeExpectedReportTest.scala @@ -57,11 +57,11 @@ import com.normation.rudder.domain.policies.RuleUid import com.normation.rudder.domain.reports.ExpectedReportsSerialisation.Version7_1.JsonRuleExpectedReports7_1 import com.normation.rudder.domain.reports.RuleExpectedReports import org.joda.time.DateTime -import org.junit.runner._ +import org.junit.runner.* import org.specs2.matcher.MatchResult -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner -import zio.json._ +import zio.json.* /** * Test that a NodeConfiguration is correctly transformed to diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/RuleValServiceTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/RuleValServiceTest.scala index c82f45af4b8..39617a78239 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/RuleValServiceTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/RuleValServiceTest.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.policies import com.normation.GitVersion -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.inventory.domain.AgentType import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.nodes.NodeGroupUid @@ -54,11 +54,11 @@ import com.normation.rudder.repository.FullActiveTechnique import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.rule.category.RuleCategoryId import com.normation.rudder.services.nodes.PropertyEngineServiceImpl -import com.normation.zio._ +import com.normation.zio.* import org.joda.time.DateTime -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import scala.collection.MapView import scala.collection.SortedMap diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestBuildNodeConfiguration.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestBuildNodeConfiguration.scala index 051a02585a8..1d8d0a44acc 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestBuildNodeConfiguration.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestBuildNodeConfiguration.scala @@ -64,14 +64,14 @@ import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.repository.FullNodeGroupCategory import com.normation.rudder.rule.category.RuleCategoryId import com.normation.rudder.services.nodes.PropertyEngineServiceImpl -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import org.joda.time.DateTime -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import scala.collection.MapView import scala.collection.SortedMap -import scala.concurrent.duration._ +import scala.concurrent.duration.* /* * This class test the JsEngine. 6.0 @@ -91,7 +91,7 @@ class TestBuildNodeConfiguration extends Specification { val t0: Long = System.currentTimeMillis() - import NodeConfigData._ + import NodeConfigData.* val data = new TestNodeConfiguration() val t0_1: Long = System.currentTimeMillis() logger.trace(s"Test node configuration : ${t0_1 - t0} ms") diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala index ff18d6c6e16..e3279406598 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala @@ -44,17 +44,17 @@ import com.normation.errors.IOResult import com.normation.errors.RudderError import com.normation.rudder.domain.appconfig.FeatureSwitch import com.normation.rudder.services.policies.JsEngine.SandboxedJsEngine -import com.normation.zio._ -import org.junit.runner._ +import com.normation.zio.* +import org.junit.runner.* import org.specs2.matcher.Matcher import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* import scala.annotation.nowarn import scala.concurrent.duration.FiniteDuration import scala.util.matching.Regex -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * This class test the JsEngine. diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala index 3d4aa9b57af..29cb0f382f6 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestNodeAndGlobalParameterLookup.scala @@ -37,23 +37,23 @@ package com.normation.rudder.services.policies -import cats.implicits._ +import cats.implicits.* import com.normation.cfclerk.domain.InputVariable import com.normation.cfclerk.domain.InputVariableSpec import com.normation.cfclerk.domain.Variable -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.services.nodes.EngineOption import com.normation.rudder.services.nodes.PropertyEngineServiceImpl import com.normation.rudder.services.nodes.RudderPropertyEngine -import com.normation.zio._ +import com.normation.zio.* import com.typesafe.config.ConfigValue import net.liftweb.common.Box import net.liftweb.common.Empty import net.liftweb.common.Failure import net.liftweb.common.Full -import net.liftweb.json._ +import net.liftweb.json.* import net.liftweb.json.JsonAST.JString import net.liftweb.json.JsonAST.JValue import org.junit.runner.RunWith @@ -63,8 +63,8 @@ import org.specs2.matcher.MatchResult import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner import scala.util.matching.Regex -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * Test how parametrized variables are replaced for @@ -106,7 +106,7 @@ class TestNodeAndGlobalParameterLookup extends Specification { def getError[A](e: PureResult[A]): String = e.swap.getOrElse(throw new RuntimeException("ERROR")).fullMsg - import NodeConfigData._ + import NodeConfigData.* // null is for RuleValService, only used in // rule lookup, node tested here. val propertyEngineService = new PropertyEngineServiceImpl( @@ -212,7 +212,7 @@ class TestNodeAndGlobalParameterLookup extends Specification { val dangerousChars: ParameterForConfiguration = ParameterForConfiguration("danger", badChars) def p(params: ParameterForConfiguration*): Map[String, ParamInterpolationContext => IOResult[String]] = { - import cats.implicits._ + import cats.implicits.* params.toList.traverse { param => for { p <- compiler @@ -221,18 +221,18 @@ class TestNodeAndGlobalParameterLookup extends Specification { } yield { (param.name, p) } - }.map(seq => Map(seq: _*)).chainError("Error when parsing parameters for interpolated variables") match { + }.map(seq => Map(seq*)).chainError("Error when parsing parameters for interpolated variables") match { case Left(err) => throw new RuntimeException(err.fullMsg) case Right(res) => res } } - import PropertyParser._ - import PropertyParserTokens._ - import fastparse._ + import PropertyParser.* + import PropertyParserTokens.* + import fastparse.* // in case of success, test for the result - def test[T](p: P[_] => P[T], value: String, result: Any): MatchResult[Any] = { + def test[T](p: P[?] => P[T], value: String, result: Any): MatchResult[Any] = { fastparse.parse(value, p(_)) match { case Parsed.Success(x, index) => x === result case f: Parsed.Failure => ko(f.trace().longAggregateMsg) @@ -1238,7 +1238,7 @@ class TestNodeAndGlobalParameterLookup extends Specification { val json = """{ "Europe" : { "France" : "Paris" } }""" "not be able to replace parameter when no properties" in { - compare("${node.properties[plop]}", ("datacenter", "some data center") :: Nil) must haveClass[Left[_, _]] + compare("${node.properties[plop]}", ("datacenter", "some data center") :: Nil) must haveClass[Left[?, ?]] } "correctly get the value even if not in JSON for 1-deep-length path" in { @@ -1248,11 +1248,11 @@ class TestNodeAndGlobalParameterLookup extends Specification { } "not be able to replace a parameter with a 2-deep length path in non-json value" in { - compare("${node.properties[datacenter][Europe]}", ("datacenter", "some data center") :: Nil) must haveClass[Left[_, _]] + compare("${node.properties[datacenter][Europe]}", ("datacenter", "some data center") :: Nil) must haveClass[Left[?, ?]] } "not be able to replace a parameter with a 2-deep length path in a json value without the asked path" in { - compare("${node.properties[datacenter][Asia]}", ("datacenter", json) :: Nil) must haveClass[Left[_, _]] + compare("${node.properties[datacenter][Asia]}", ("datacenter", json) :: Nil) must haveClass[Left[?, ?]] } "correclty return the compacted json string for 1-length" in { @@ -1356,8 +1356,8 @@ class TestNodeAndGlobalParameterLookup extends Specification { i(c).either.runNow } - compare("DataCenter", "datacenter") must haveClass[Left[_, _]] - compare("datacenter", "DataCenter") must haveClass[Left[_, _]] + compare("DataCenter", "datacenter") must haveClass[Left[?, ?]] + compare("datacenter", "DataCenter") must haveClass[Left[?, ?]] compare("datacenter", "datacenter") must beEqualTo(Right(GenericProperty.serializeToJson(value))) } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala index 92beea9ac95..f6e1d56fd57 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala @@ -46,7 +46,7 @@ import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.PublicKey import com.normation.rudder.domain.nodes.NodeInfo import com.normation.zio.ZioRuntime -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import java.io.ByteArrayOutputStream import java.nio.charset.StandardCharsets import org.junit.runner.RunWith @@ -150,7 +150,7 @@ class TestWriteNodeCertificatesPem extends Specification { val writer = new WriteNodeCertificatesPemImpl(Some("/non/existing/command")) - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* val log = writer.logger.logEffect.asInstanceOf[ch.qos.logback.classic.Logger] diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepositoryTest.scala index 12fda54ce52..268777ef649 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/nodeconfig/NodeConfigurationCacheRepositoryTest.scala @@ -36,9 +36,9 @@ */ package com.normation.rudder.services.policies.nodeconfig -import better.files._ +import better.files.* import com.normation.GitVersion -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.DirectiveUid @@ -51,9 +51,9 @@ import net.liftweb.common.Loggable import org.apache.commons.io.FileUtils import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import org.specs2.specification.AfterAll @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala index a6c2ba7d355..6329ca8b008 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala @@ -47,7 +47,7 @@ import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) class PathComputerTest extends Specification { - import com.normation.rudder.services.policies.NodeConfigData._ + import com.normation.rudder.services.policies.NodeConfigData.* val allNodeConfig: Map[NodeId, NodeConfiguration] = Map(root.id -> rootNodeConfig, node1.id -> node1NodeConfig, node2.id -> node2NodeConfig) @@ -65,7 +65,7 @@ class PathComputerTest extends Specification { "The paths for " should { "the root node should raise an error" in { pathComputer.computeBaseNodePath(root.id, root.id, allNodeConfig.view.mapValues(_.nodeInfo).toMap) must beAnInstanceOf[ - Left[Inconsistency, _] + Left[Inconsistency, ?] ] } @@ -96,7 +96,7 @@ class PathComputerTest extends Specification { val badNode2 = node2NodeConfig.copy(nodeInfo = node2NodeConfig.nodeInfo.copy(policyServerId = node1.id)) val badConfig = allNodeConfig + (node1.id -> badNode1) + (node2.id -> badNode2) pathComputer.computeBaseNodePath(node1.id, root.id, badConfig.view.mapValues(_.nodeInfo).toMap) must beAnInstanceOf[ - Left[Inconsistency, _] + Left[Inconsistency, ?] ] } } diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala index ccd6dc4c353..26b9f12b34c 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PolicyAgregationTest.scala @@ -37,7 +37,7 @@ package com.normation.rudder.services.policies.write -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.inventory.domain.AgentType import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.DirectiveUid diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariableTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariableTest.scala index 106b61dcdf7..84bf741f473 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariableTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariableTest.scala @@ -48,11 +48,11 @@ import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.policies.RuleUid import com.normation.rudder.services.policies.NodeRunHook import com.normation.rudder.services.policies.PolicyId -import com.normation.rudder.services.policies.write.BuildBundleSequence._ +import com.normation.rudder.services.policies.write.BuildBundleSequence.* import com.normation.templates.FillTemplatesService -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class PrepareTemplateVariableTest extends Specification { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala index 9c0fe65b6d1..9817f8e690a 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala @@ -66,7 +66,7 @@ import com.normation.rudder.services.policies.Policy import com.normation.rudder.services.policies.TestNodeConfiguration import com.normation.rudder.services.policies.write.PolicyWriterServiceImpl.filepaths import com.normation.templates.FillTemplatesService -import com.normation.zio._ +import com.normation.zio.* import java.io.File import java.nio.charset.StandardCharsets import java.util.regex.Pattern @@ -85,7 +85,7 @@ import org.specs2.runner.JUnitRunner import org.specs2.specification.AfterAll import org.specs2.text.LinesContent import scala.collection.MapView -import zio.syntax._ +import zio.syntax.* /** * Details of tests executed in each instances of @@ -104,7 +104,7 @@ class TestSystemData { //////////// init //////////// val data = new TestNodeConfiguration() - import data._ + import data.* val logNodeConfig = new NodeConfigurationLoggerImpl(abstractRoot.getPath + "/lognodes") @@ -234,8 +234,8 @@ final private case class RegexFileContent(regex: List[String]) extends LinesCont trait TechniquesTest extends Specification with Loggable with BoxSpecMatcher with ContentMatchers with AfterAll { val testSystemData = new TestSystemData() - import testSystemData._ - import testSystemData.data._ + import testSystemData.* + import testSystemData.data.* /* * put regex for line you don't want to be compared for difference @@ -286,8 +286,8 @@ trait TechniquesTest extends Specification with Loggable with BoxSpecMatcher wit @RunWith(classOf[JUnitRunner]) class WriteSystemTechniquesTest extends TechniquesTest { - import testSystemData._ - import testSystemData.data._ + import testSystemData.* + import testSystemData.data.* val parallelism: Int = Integer.max(1, java.lang.Runtime.getRuntime.availableProcessors() / 2) @@ -551,8 +551,8 @@ class WriteSystemTechniquesTest extends TechniquesTest { @RunWith(classOf[JUnitRunner]) class WriteSystemTechniques500Test extends TechniquesTest { - import testSystemData._ - import testSystemData.data._ + import testSystemData.* + import testSystemData.data.* val parallelism: Int = Integer.max(1, java.lang.Runtime.getRuntime.availableProcessors() / 2) @@ -646,8 +646,8 @@ class WriteSystemTechniques500Test extends TechniquesTest { @RunWith(classOf[JUnitRunner]) class WriteSystemTechniqueWithRevisionTest extends TechniquesTest { - import testSystemData._ - import testSystemData.data._ + import testSystemData.* + import testSystemData.data.* val parallelism: Int = Integer.max(1, java.lang.Runtime.getRuntime.availableProcessors() / 2) val rnc: NodeConfiguration = rootNodeConfig.copy( @@ -676,10 +676,10 @@ class WriteSystemTechniqueWithRevisionTest extends TechniquesTest { * It can't check for directive revision since we don't store them here. */ "Check that revision work for techniques" should { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* val APPENED_TEXT = "# the file is modified on HEAD\n" - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* def getCurrentCommitId = (repo.git .log() .setMaxCount(1) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala index e296dc7e722..016188af9fd 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala @@ -38,9 +38,9 @@ package com.normation.rudder.services.queries import com.normation.rudder.domain.queries.NodeReturnType -import net.liftweb.common._ -import org.junit._ -import org.junit.Assert._ +import net.liftweb.common.* +import org.junit.* +import org.junit.Assert.* import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala index f3dda1a56ea..7ead7036dde 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala @@ -38,24 +38,24 @@ package com.normation.rudder.services.queries import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.Software import com.normation.rudder.domain.RudderDit import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.nodes.NodeGroupUid -import com.normation.rudder.domain.queries._ -import com.normation.rudder.facts.nodes._ +import com.normation.rudder.domain.queries.* +import com.normation.rudder.facts.nodes.* import com.normation.rudder.tenants.DefaultTenantService -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import com.unboundid.ldap.sdk.DN import net.liftweb.common.Failure -import org.junit._ +import org.junit.* import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * Test query parsing. @@ -128,7 +128,7 @@ class TestNodeFactQueryProcessor { } val internalLDAPQueryProcessor: InternalLDAPQueryProcessor = { - import MockLdapFactStorage._ + import MockLdapFactStorage.* val rudderDit = new RudderDit(new DN("ou=Rudder, cn=rudder-configuration")) val ditQueryData = new DitQueryData(acceptedDIT, nodeDit, rudderDit, queryData) new InternalLDAPQueryProcessor(ldapRo, acceptedDIT, nodeDit, ditQueryData, ldapMapper) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala index e2a31d3c777..e1d527892b9 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala @@ -37,8 +37,8 @@ package com.normation.rudder.services.queries -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.inventory.ldap.core.LDAPConstants.A_MACHINE_UUID import com.normation.inventory.ldap.core.LDAPConstants.OC_MACHINE @@ -55,7 +55,7 @@ import com.normation.rudder.domain.queries.NodeCriterionMatcherString import com.normation.rudder.domain.queries.ObjectCriterion import com.normation.rudder.domain.queries.Or import com.normation.rudder.domain.queries.Query -import com.normation.rudder.domain.queries.ResultTransformation._ +import com.normation.rudder.domain.queries.ResultTransformation.* import com.normation.rudder.domain.queries.StringComparator import com.normation.rudder.facts.nodes.QueryContext import net.liftweb.common.Box @@ -66,7 +66,7 @@ import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner import zio.Chunk -import zio.syntax._ +import zio.syntax.* /** * Test pending node policies with group of groups diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala index 5f3f5562101..d62836eb077 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala @@ -37,11 +37,11 @@ package com.normation.rudder.services.queries -import com.normation.rudder.domain.queries._ -import com.normation.rudder.domain.queries.ResultTransformation._ -import net.liftweb.common._ -import org.junit._ -import org.junit.Assert._ +import com.normation.rudder.domain.queries.* +import com.normation.rudder.domain.queries.ResultTransformation.* +import net.liftweb.common.* +import org.junit.* +import org.junit.Assert.* import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner import zio.Chunk diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/quicksearch/QSRegexQueryParserTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/quicksearch/QSRegexQueryParserTest.scala index 4621e272565..ea281c46d4d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/quicksearch/QSRegexQueryParserTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/quicksearch/QSRegexQueryParserTest.scala @@ -37,18 +37,18 @@ package com.normation.rudder.services.quicksearch -import net.liftweb.common._ -import org.junit.runner._ +import net.liftweb.common.* +import org.junit.runner.* import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class QSRegexQueryParserTest extends Specification { import QSRegexQueryParser.parse - import com.normation.rudder.services.quicksearch.QSAttribute._ - import com.normation.rudder.services.quicksearch.QSObject._ + import com.normation.rudder.services.quicksearch.QSAttribute.* + import com.normation.rudder.services.quicksearch.QSObject.* implicit class BoxMustFails[T](t: Box[T]) { def mustFails(): MatchResult[Any] = t match { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala index 51083dc66f1..9a6763030e3 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala @@ -62,13 +62,13 @@ import com.normation.rudder.score.ScoreService import com.normation.rudder.score.ScoreServiceManager import com.normation.rudder.services.policies.NodeConfigData import com.normation.rudder.tenants.DefaultTenantService -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import net.liftweb.common.Box import net.liftweb.common.Full import org.joda.time.DateTime import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import zio.Chunk import zio.syntax.ToZio diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ComplianceTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ComplianceTest.scala index 4f1bf117f7e..c1b71c1cf37 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ComplianceTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ComplianceTest.scala @@ -52,9 +52,9 @@ import net.liftweb.common.Failure import net.liftweb.common.Full import org.joda.time.format.DateTimeFormatter import org.joda.time.format.DateTimeFormatterBuilder -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import scala.io.Source /** diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala index 4bc18c28e80..8be6055f682 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ExecutionBatchTest.scala @@ -47,7 +47,7 @@ import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.policies.PolicyModeOverrides import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.policies.RuleUid -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.domain.reports.DirectiveExpectedReports import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.reports.FullCompliance @@ -59,9 +59,9 @@ import com.normation.rudder.services.reports.ExecutionBatch.MergeInfo import com.normation.rudder.services.reports.UnexpectedReportBehavior.UnboundVarValues import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* import scala.annotation.nowarn @nowarn("msg=a type was inferred to be `\\w+`; this may indicate a programming error.") @@ -82,7 +82,7 @@ class ExecutionBatchTest extends Specification { .asInstanceOf[ch.qos.logback.classic.Logger] .setLevel(ch.qos.logback.classic.Level.OFF) - import ReportType._ + import ReportType.* val strictUnexpectedInterpretation: UnexpectedReportInterpretation = UnexpectedReportInterpretation(Set()) val executionTimestamp = new DateTime() diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala index 8443b27dafe..0095b2c6d8b 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/ReportingServiceUtilsTest.scala @@ -52,10 +52,10 @@ import com.normation.rudder.domain.reports.RuleStatusReport import com.normation.rudder.domain.reports.RunComplianceInfo import com.normation.rudder.services.policies.PolicyId import org.joda.time.DateTime -import org.junit.runner._ +import org.junit.runner.* import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class ReportingServiceUtilsTest extends Specification { diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/servers/TestRemoveNodeService.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/servers/TestRemoveNodeService.scala index f1b4ed8d044..abd06320ee8 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/servers/TestRemoveNodeService.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/servers/TestRemoveNodeService.scala @@ -36,17 +36,17 @@ */ package com.normation.rudder.services.servers -import better.files._ +import better.files.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId import com.normation.rudder.facts.nodes.ChangeContext import com.normation.rudder.facts.nodes.QueryContext -import com.normation.zio._ +import com.normation.zio.* import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import org.specs2.specification.AfterAll diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/workflows/TestCheckMergeDivergence.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/workflows/TestCheckMergeDivergence.scala index 968bcdb8763..9e522f2cd33 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/workflows/TestCheckMergeDivergence.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/workflows/TestCheckMergeDivergence.scala @@ -41,7 +41,7 @@ import com.normation.rudder.domain.policies.Directive import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.DirectiveUid import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/users/UserRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/users/UserRepositoryTest.scala index 0a2fbe6c44d..a0a9d297b40 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/users/UserRepositoryTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/users/UserRepositoryTest.scala @@ -4,8 +4,8 @@ import com.normation.errors import com.normation.eventlog.EventActor import com.normation.rudder.db.DBCommon import com.normation.rudder.db.Doobie -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import net.liftweb.common.Loggable import org.joda.time.DateTime import org.joda.time.DateTimeZone diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/utils/RepetitionComputerTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/utils/RepetitionComputerTest.scala index 0845ec57d1b..02d56dbc04d 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/utils/RepetitionComputerTest.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/utils/RepetitionComputerTest.scala @@ -37,8 +37,8 @@ package com.normation.utils -import org.joda.time.{Days => _, _} -import org.joda.time.format._ +import org.joda.time.{Days as _, *} +import org.joda.time.format.* import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigRepository.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigRepository.scala index e46f9af6b0a..b8bf2d2640f 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigRepository.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigRepository.scala @@ -36,7 +36,7 @@ */ package com.normation.appconfig -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.ldap.sdk.BuildFilter.IS @@ -49,8 +49,8 @@ import com.normation.rudder.domain.eventlog.ModifyGlobalPropertyEventType import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.repository.ldap.LDAPEntityMapper import com.normation.utils.StringUuidGenerator -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * A basic config repository, NOT typesafe. diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala index bf3ed9706c0..bb59d3789db 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala @@ -37,7 +37,7 @@ package com.normation.appconfig import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.rudder.batch.AsyncWorkflowInfo import com.normation.rudder.batch.PolicyGenerationTrigger @@ -54,9 +54,9 @@ import com.normation.rudder.domain.eventlog.ModifySendServerMetricsEventType import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.domain.policies.GlobalPolicyMode import com.normation.rudder.domain.policies.PolicyMode -import com.normation.rudder.domain.policies.PolicyMode._ +import com.normation.rudder.domain.policies.PolicyMode.* import com.normation.rudder.domain.policies.PolicyModeOverrides -import com.normation.rudder.reports._ +import com.normation.rudder.reports.* import com.normation.rudder.reports.ChangesOnly import com.normation.rudder.reports.ComplianceMode import com.normation.rudder.reports.FullCompliance @@ -64,7 +64,7 @@ import com.normation.rudder.services.policies.SendMetrics import com.normation.rudder.services.reports.UnexpectedReportBehavior import com.normation.rudder.services.reports.UnexpectedReportInterpretation import com.normation.rudder.services.servers.RelaySynchronizationMethod -import com.normation.rudder.services.servers.RelaySynchronizationMethod._ +import com.normation.rudder.services.servers.RelaySynchronizationMethod.* import com.normation.rudder.services.workflows.WorkflowLevelService import com.normation.rudder.services.workflows.WorkflowUpdate import com.typesafe.config.Config @@ -72,8 +72,8 @@ import com.typesafe.config.ConfigFactory import net.liftweb.common.EmptyBox import net.liftweb.common.Full import scala.concurrent.duration.Duration -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * A service that Read mutable (runtime) configuration properties diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala index f8401efe3e0..8df1710dbe4 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/Authorizations.scala @@ -36,17 +36,17 @@ */ package com.normation.rudder -import cats.implicits._ +import cats.implicits.* import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.errors.PureResult import com.normation.rudder.Role.Builtin import com.normation.rudder.Role.BuiltinName import com.normation.rudder.domain.logger.ApplicationLoggerPure -import com.normation.zio._ +import com.normation.zio.* import scala.collection.immutable.SortedMap -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * Base class for Authorization types. @@ -336,7 +336,7 @@ sealed trait Role { def debugString: String = name } object Role { - import com.normation.rudder.{AuthorizationType => A} + import com.normation.rudder.AuthorizationType as A // for now, all account type also have the "user account" rights val ua = A.UserAccount.values @@ -387,7 +387,7 @@ object Role { // standard predefined built-in roles def standardBuiltIn: Map[BuiltinName, Role] = { - import BuiltinName._ + import BuiltinName.* List( Builtin(User, Rights(ua ++ A.nodeKind ++ A.configurationKind)), Builtin(AdministrationOnly, Rights(ua ++ A.Administration.values.map(identity))), @@ -462,7 +462,7 @@ object RudderRoles { // built-in roles are provided by Rudder core and can be provided by plugins. We assume people knows what they are doing // and fewer check are done on them. - private val builtInCoreRoles = SortedMap[String, Role](Role.allBuiltInRoles.toList: _*) + private val builtInCoreRoles = SortedMap[String, Role](Role.allBuiltInRoles.toList*) // this is the actual set of currently knowed builin roles val builtInRoles: Ref[SortedMap[String, Role]] = Ref.make(builtInCoreRoles).runNow @@ -493,7 +493,7 @@ object RudderRoles { for { crs <- customRoles.updateAndGet(existing => { val newRoles = roles.map(r => (r.name.toLowerCase, r)) - if (resetExisting) SortedMap(newRoles: _*) else existing ++ newRoles + if (resetExisting) SortedMap(newRoles*) else existing ++ newRoles }) all <- computeAllRoles _ <- allRoles.set(all) @@ -644,7 +644,7 @@ object RudderRoles { // utility sub-function to resolve one role list in the context of `knownRoles`. def resolveOne(knownRoles: Map[String, Role], role: PendingRole): Either[PendingRole, Role.NamedCustom] = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* // role can't be duplicate (case insensitive) val toResolve = role.pending.distinctBy(_.toLowerCase) val firstPass = toResolve.foldLeft(role.modify(_.pending).setTo(Nil)) { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala index f9338dbbd2e..94eaa614b09 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala @@ -37,23 +37,23 @@ package com.normation.rudder.rest -import cats.data._ -import cats.implicits._ -import com.normation.rudder.api.{ApiAuthorization => ApiAuthz} +import cats.data.* +import cats.implicits.* import com.normation.rudder.api.AclPath import com.normation.rudder.api.AclPathSegment import com.normation.rudder.api.ApiAccount import com.normation.rudder.api.ApiAccountKind import com.normation.rudder.api.ApiAclElement +import com.normation.rudder.api.ApiAuthorization as ApiAuthz import com.normation.rudder.api.HttpAction import com.normation.rudder.domain.logger.ApiLogger import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.users.CurrentUser import com.normation.rudder.users.RudderAccount import com.normation.rudder.users.UserService -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.LiftResponse -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* /* * This trait allows to check for authorisation on a given boundedendpoint @@ -259,8 +259,8 @@ object AclCheck { */ def matches(aclPath: AclPath, path: ApiPath): Boolean = { def recMatches(p1: List[AclPathSegment], p2: List[ApiPathSegment]): Boolean = { - import AclPathSegment.{DoubleWildcard, Wildcard, Segment => AclSegment} - import ApiPathSegment.{Segment => ApiSegment} + import AclPathSegment.{DoubleWildcard, Wildcard, Segment as AclSegment} + import ApiPathSegment.Segment as ApiSegment (p1, p2) match { case (Nil, Nil) => true @@ -281,7 +281,7 @@ object AclCheck { * we must check rights by hand; */ object OldInternalApiAuthz { - import com.normation.rudder.AuthorizationType._ + import com.normation.rudder.AuthorizationType.* def fail(implicit action: String): Failure = Failure( s"User '${CurrentUser.actor.name}' is not authorized to access API '${action}" ) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala index 785c2da350a..d5854ba5929 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiDatastructures.scala @@ -37,8 +37,8 @@ package com.normation.rudder.rest -import cats.data._ -import cats.implicits._ +import cats.data.* +import cats.implicits.* import com.normation.rudder.AuthorizationType import com.normation.rudder.api.ApiVersion import com.normation.rudder.api.HttpAction @@ -158,7 +158,7 @@ object ApiPath { case Nil => Left("The given is empty, it can't be a Rudder API path") case h :: t => - Right(ApiPath.of(h, t: _*)) + Right(ApiPath.of(h, t*)) } } @@ -166,7 +166,7 @@ object ApiPath { // Path are compatible when all subpath elements are equals, and when they are of the same size // (resource elements act as joker def compatible(p1: ApiPath, p2: ApiPath): Boolean = { - import ApiPathSegment._ + import ApiPathSegment.* (p1.parts.size == p2.parts.size) && (p1.parts.toList.lazyZip(p2.parts.toList)).forall { case (Segment(a), Segment(b)) => a == b case (Resource(_), _) => true diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala index 20c92644b2c..89e05616b4f 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala @@ -37,8 +37,8 @@ package com.normation.rudder.rest -import com.normation.rudder.api.HttpAction._ -import com.normation.rudder.rest.EndpointSchema.syntax._ +import com.normation.rudder.api.HttpAction.* +import com.normation.rudder.rest.EndpointSchema.syntax.* import sourcecode.Line /* diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala index a27a18ef975..558a84ac268 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala @@ -38,24 +38,24 @@ package com.normation.rudder.rest import com.normation.GitVersion -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.Technique import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.services.TechniqueRepository -import com.normation.errors._ +import com.normation.errors.* import com.normation.inventory.domain.Certificate import com.normation.inventory.domain.InventoryError import com.normation.inventory.domain.KeyStatus import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.PublicKey import com.normation.inventory.domain.SecurityToken -import com.normation.rudder.api.{ApiAuthorization => ApiAuthz} import com.normation.rudder.api.AclPath import com.normation.rudder.api.ApiAccountId import com.normation.rudder.api.ApiAccountName import com.normation.rudder.api.ApiAclElement +import com.normation.rudder.api.ApiAuthorization as ApiAuthz import com.normation.rudder.api.ApiAuthorizationKind import com.normation.rudder.api.HttpAction import com.normation.rudder.apidata.CustomDetailLevel @@ -64,7 +64,7 @@ import com.normation.rudder.apidata.FullDetailLevel import com.normation.rudder.apidata.MinimalDetailLevel import com.normation.rudder.apidata.NodeDetailLevel import com.normation.rudder.domain.nodes.NodeGroupCategoryId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GroupProperty @@ -75,17 +75,17 @@ import com.normation.rudder.domain.queries.NodeReturnType import com.normation.rudder.domain.queries.Query import com.normation.rudder.domain.queries.QueryReturnType import com.normation.rudder.domain.reports.CompliancePrecision -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.facts.nodes.NodeSecurityContext import com.normation.rudder.ncf.ParameterType.ParameterTypeService -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.repository.json.DataExtractor.CompleteJson import com.normation.rudder.repository.ldap.NodeStateEncoder -import com.normation.rudder.rest.data._ +import com.normation.rudder.rest.data.* import com.normation.rudder.rule.category.RuleCategoryId import com.normation.rudder.services.policies.PropertyParser import com.normation.rudder.services.queries.CmdbQueryParser -import com.normation.rudder.services.queries.CmdbQueryParser._ +import com.normation.rudder.services.queries.CmdbQueryParser.* import com.normation.rudder.services.queries.JsonQueryLexer import com.normation.rudder.services.queries.StringCriterionLine import com.normation.rudder.services.queries.StringQuery @@ -93,21 +93,21 @@ import com.normation.rudder.services.workflows.WorkflowLevelService import com.normation.rudder.web.services.ReasonBehavior import com.normation.rudder.web.services.UserPropertyService import com.normation.utils.Control -import com.normation.utils.Control._ +import com.normation.utils.Control.* import com.normation.utils.DateFormaterService import com.normation.utils.StringUuidGenerator import java.io.StringReader -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.common.Box.option2Box import net.liftweb.http.Req -import net.liftweb.json._ +import net.liftweb.json.* import net.liftweb.json.JObject -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo import org.bouncycastle.cert.X509CertificateHolder import org.bouncycastle.openssl.PEMParser -import zio.{Tag => _, _} -import zio.syntax._ +import zio.{Tag as _, *} +import zio.syntax.* final case class RestExtractorService( readRule: RoRuleRepository, @@ -121,7 +121,7 @@ final case class RestExtractorService( parameterTypeService: ParameterTypeService ) extends Loggable { - import com.normation.rudder.repository.json.DataExtractor.OptionnalJson._ + import com.normation.rudder.repository.json.DataExtractor.OptionnalJson.* /* * Params Extractors */ @@ -456,7 +456,7 @@ final case class RestExtractorService( } def extractReason(req: Req): Box[Option[String]] = { - import ReasonBehavior._ + import ReasonBehavior.* userPropertyService.reasonsFieldBehavior match { case Disabled => Full(None) case mode => @@ -574,7 +574,7 @@ final case class RestExtractorService( } def toTag(s: String): Box[Tag] = { - import Tag._ + import Tag.* val list = s.split(":") val name = list.headOption.getOrElse(s) val value = list.tail.headOption.getOrElse("") @@ -663,8 +663,8 @@ final case class RestExtractorService( } def extractProperties[A](params: Map[String, List[String]], make: (String, String) => PureResult[A]): Box[Option[List[A]]] = { - import cats.implicits._ - import com.normation.box._ + import cats.implicits.* + import com.normation.box.* extractList(params, "properties") { props => (props.traverse { prop => @@ -866,7 +866,7 @@ final case class RestExtractorService( } def toTagJson(json: JValue): Box[Tag] = { - import Tag._ + import Tag.* json match { case JObject(JField(name, JString(value)) :: Nil) => Full(Tag(name, value)) case _ => Failure("Not valid format for tags") diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala index dddd14989a5..d0dbae6de54 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala @@ -47,12 +47,12 @@ import net.liftweb.common.EmptyBox import net.liftweb.common.Failure import net.liftweb.common.Full import net.liftweb.common.Loggable -import net.liftweb.http._ +import net.liftweb.http.* import net.liftweb.http.Req import net.liftweb.http.provider.HTTPCookie -import net.liftweb.json._ +import net.liftweb.json.* import net.liftweb.json.JsonAST.RenderSettings -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import net.liftweb.util.Helpers.tryo /* diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala index 979e7777600..15011baab1e 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala @@ -40,9 +40,9 @@ package com.normation.rudder.rest import com.normation.rudder.AuthorizationType import com.normation.rudder.Rights import com.normation.rudder.Role -import com.normation.rudder.api.{ApiAuthorization => ApiAuthz} import com.normation.rudder.api.AclPathSegment import com.normation.rudder.api.ApiAclElement +import com.normation.rudder.api.ApiAuthorization as ApiAuthz /* * The goal of that class is to map Authorization to what API @@ -103,7 +103,7 @@ object AuthorizationApiMapping { object Core extends AuthorizationApiMapping { override def mapAuthorization(authz: AuthorizationType): List[ApiAclElement] = { - import AuthorizationType._ + import AuthorizationType.* // shorthand to get authz for a given api authz match { case NoRights => Nil @@ -239,7 +239,7 @@ class RoleApiMapping(mapper: AuthorizationApiMapping) { } else if (rights.authorizationTypes.contains(AuthorizationType.AnyRights)) { ApiAuthz.allAuthz.acl } else { - import cats.implicits._ + import cats.implicits.* // problem: here, rights.authorizationTypes is a set, so not ordered. Acl ARE // ordered. But this is OK **IF** we don't user any double joker (exhaustive match) mergeToAcl(rights.authorizationTypes.toList.foldMap(mapAuthorization)) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala index b28a17d0c58..5c6ea845dbf 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala @@ -40,7 +40,7 @@ package com.normation.rudder.rest import com.normation.errors.PureResult import com.normation.rudder.apidata.ZioJsonExtractor import net.liftweb.http.Req -import zio.json._ +import zio.json.* /** * This class exposes utility methods regarding JSON requests. diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala index a4e3fa0835d..9593ca6d063 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonResponse.scala @@ -37,15 +37,15 @@ package com.normation.rudder.rest -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.rest.lift.DefaultParams import com.normation.rudder.rest.lift.LiftApiProcessingLogger -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.http.InMemoryResponse import net.liftweb.http.LiftResponse import scala.annotation.nowarn import scala.collection.immutable -import zio.json._ +import zio.json.* import zio.json.DeriveJsonEncoder /* @@ -136,7 +136,7 @@ object RudderJsonResponse { def successOne[A](schema: ResponseSchema, obj: A, id: Option[String])(implicit prettify: Boolean, encoder: JsonEncoder[A] - ): LiftJsonResponse[_ <: JsonRudderApiResponse[_]] = { + ): LiftJsonResponse[? <: JsonRudderApiResponse[?]] = { schema.dataContainer match { case Some(key) => implicit val enc: JsonEncoder[JsonRudderApiResponse[Map[String, List[A]]]] = DeriveJsonEncoder.gen @@ -151,7 +151,7 @@ object RudderJsonResponse { prettify: Boolean, encoder: JsonEncoder[A] ): LiftJsonResponse[ - _ <: JsonRudderApiResponse[_ <: immutable.Iterable[Any] with PartialFunction[Int with String, Any] with Equals] + ? <: JsonRudderApiResponse[? <: immutable.Iterable[Any] with PartialFunction[Int with String, Any] with Equals] ] = { schema.dataContainer match { case None => diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/Compliance.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/Compliance.scala index 645cf4aed26..2612f24182f 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/Compliance.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/Compliance.scala @@ -41,13 +41,13 @@ import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.policies.DirectiveId import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.rudder.domain.reports.ComplianceLevel import com.normation.rudder.reports.ComplianceModeName import java.lang -import net.liftweb.json._ +import net.liftweb.json.* import net.liftweb.json.JsonAST -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import org.apache.commons.csv.CSVFormat import org.apache.commons.csv.QuoteMode import scala.collection.immutable @@ -447,7 +447,7 @@ object CsvCompliance { // csvFormat take care of the line separator val out = new lang.StringBuilder() csvFormat.printRecord(out, "Rule", "Block", "Component", "Node", "Value", "Status", "Message") - csvLines.foreach(l => csvFormat.printRecord(out, l: _*)) + csvLines.foreach(l => csvFormat.printRecord(out, l*)) out.toString } } @@ -1140,7 +1140,7 @@ object JsonCompliance { } def statusDisplayName(r: ReportType): String = { - import ReportType._ + import ReportType.* r match { case EnforceNotApplicable => "successNotApplicable" @@ -1168,7 +1168,7 @@ object JsonCompliance { * */ private[this] def percents(c: ComplianceLevel, precision: CompliancePrecision): Map[String, Double] = { - import ReportType._ + import ReportType.* // we want at most `precision` decimals val pc = CompliancePercent.fromLevels(c, precision) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala index 820dab3bae6..38096aea418 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala @@ -37,13 +37,13 @@ package com.normation.rudder.rest.data -import cats.data._ -import cats.implicits._ +import cats.data.* +import cats.implicits.* import com.normation.NamedZioLogger -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.domain.AgentType.CfeCommunity import com.normation.inventory.domain.AgentType.Dsc -import com.normation.inventory.domain.VmType._ +import com.normation.inventory.domain.VmType.* import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.domain.policies.PolicyMode import com.normation.rudder.domain.properties.GenericProperty @@ -51,7 +51,7 @@ import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.rest.data.Creation.CreationError import com.normation.rudder.rest.data.NodeTemplate.AcceptedNodeTemplate import com.normation.rudder.rest.data.NodeTemplate.PendingNodeTemplate -import com.softwaremill.quicklens._ +import com.softwaremill.quicklens.* import com.typesafe.config.ConfigValue import java.util.regex.Pattern import net.liftweb.json.JArray @@ -118,8 +118,8 @@ object Rest { object JsonCodecNodeDetails { import com.typesafe.config.ConfigRenderOptions - import zio.json._ - import zio.json.ast._ + import zio.json.* + import zio.json.ast.* import zio.json.internal.Write implicit val codecConfigValue: JsonCodec[ConfigValue] = JsonCodec( @@ -194,7 +194,7 @@ object ResultHolder { implicit class ResultHolderToJson(res: ResultHolder) { def toJson(): JValue = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* ( ("created" -> JArray(res.created.map(id => JString(id.value)))) ~ ("failed" -> @@ -241,11 +241,11 @@ object Creation { } object Validation { - import Rest._ - import Validated._ + import Rest.* + import Validated.* import com.normation.inventory.domain.AcceptedInventory import com.normation.inventory.domain.PendingInventory - import com.normation.rudder.domain.policies.{PolicyMode => PM} + import com.normation.rudder.domain.policies.PolicyMode as PM type Validation[T] = ValidatedNel[NodeValidationError, T] @@ -417,7 +417,7 @@ object Validation { def checkAgent(osType: OsType, agent: AgentKey): Validation[AgentInfo] = { def checkSecurityToken(agent: AgentType, token: String): Validation[SecurityToken] = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* val tpe = if (token.contains("BEGIN CERTIFICATE")) Certificate.kind else PublicKey.kind AgentInfoSerialisation.parseSecurityToken(agent, ("type" -> tpe) ~ ("value" -> token), None) match { case Left(err) => NodeValidationError.SecurityVal(err.fullMsg).invalidNel diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala index 752683779a9..9fc6e969e75 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala @@ -62,9 +62,9 @@ import com.normation.rudder.domain.properties.PropertyProvider import com.normation.rudder.domain.queries.Query import com.normation.rudder.domain.workflows.ChangeRequestInfo import com.normation.rudder.repository.FullNodeGroupCategory -import com.normation.rudder.rule.category._ +import com.normation.rudder.rule.category.* import com.typesafe.config.ConfigValue -import net.liftweb.common._ +import net.liftweb.common.* final case class APIChangeRequestInfo( name: Option[String], diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala index 06b598539ce..e7c7de04616 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala @@ -36,29 +36,29 @@ */ package com.normation.rudder.rest.internal -import cats.syntax.all._ -import com.normation.box._ -import com.normation.eventlog._ +import cats.syntax.all.* +import com.normation.box.* +import com.normation.eventlog.* import com.normation.rudder.repository.EventLogRepository import com.normation.rudder.repository.json.DataExtractor.CompleteJson import com.normation.rudder.rest.OldInternalApiAuthz import com.normation.rudder.rest.RestExtractorService -import com.normation.rudder.rest.RestUtils._ +import com.normation.rudder.rest.RestUtils.* import com.normation.rudder.services.user.PersonIdentService import com.normation.rudder.users.CurrentUser -import com.normation.rudder.web.services._ +import com.normation.rudder.web.services.* import com.normation.utils.DateFormaterService -import doobie._ -import doobie.implicits._ -import doobie.implicits.javasql._ -import net.liftweb.common._ +import doobie.* +import doobie.implicits.* +import doobie.implicits.javasql.* +import net.liftweb.common.* import net.liftweb.http.JsonResponse import net.liftweb.http.LiftResponse import net.liftweb.http.Req import net.liftweb.http.S import net.liftweb.http.rest.RestHelper import net.liftweb.json.JsonAST -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import net.liftweb.json.JValue import net.liftweb.util.Helpers.tryo import org.joda.time.DateTime @@ -75,7 +75,7 @@ class EventLogAPI( } def serialize(event: EventLog): JValue = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* (("id" -> event.id) ~ ("date" -> DateFormaterService.getDisplayDate(event.creationDate)) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestApiAccounts.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestApiAccounts.scala index 171aa1f7cf0..6667ad04472 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestApiAccounts.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestApiAccounts.scala @@ -1,23 +1,23 @@ package com.normation.rudder.rest import com.normation.eventlog.ModificationId -import com.normation.rudder.api._ -import com.normation.rudder.api.{ApiAuthorization => ApiAuthz} +import com.normation.rudder.api.* +import com.normation.rudder.api.ApiAuthorization as ApiAuthz import com.normation.rudder.api.RoApiAccountRepository import com.normation.rudder.api.WoApiAccountRepository -import com.normation.rudder.apidata.ApiAccountSerialisation._ +import com.normation.rudder.apidata.ApiAccountSerialisation.* import com.normation.rudder.facts.nodes.NodeSecurityContext -import com.normation.rudder.rest.RestUtils._ +import com.normation.rudder.rest.RestUtils.* import com.normation.rudder.tenants.TenantService import com.normation.rudder.users.UserService import com.normation.utils.StringUuidGenerator -import com.normation.zio._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.common.* import net.liftweb.common.Loggable import net.liftweb.http.LiftResponse import net.liftweb.http.rest.RestHelper import net.liftweb.json.JArray -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import org.joda.time.DateTime class RestApiAccounts( diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestCompletion.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestCompletion.scala index e3656ddd667..6cdeb0db4d8 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestCompletion.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestCompletion.scala @@ -37,14 +37,14 @@ package com.normation.rudder.rest.internal -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.RoRuleRepository import com.normation.rudder.rest.OldInternalApiAuthz -import com.normation.rudder.rest.RestUtils._ -import net.liftweb.common._ +import com.normation.rudder.rest.RestUtils.* +import net.liftweb.common.* import net.liftweb.http.rest.RestHelper -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* class RestCompletion( completion: RestCompletionService diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestQuicksearch.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestQuicksearch.scala index 0fe88f01a72..117ba169373 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestQuicksearch.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RestQuicksearch.scala @@ -37,23 +37,23 @@ package com.normation.rudder.rest.internal -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.AuthorizationType import com.normation.rudder.domain.nodes.NodeGroupUid import com.normation.rudder.domain.policies.RuleUid import com.normation.rudder.rest.OldInternalApiAuthz -import com.normation.rudder.rest.RestUtils._ +import com.normation.rudder.rest.RestUtils.* import com.normation.rudder.services.quicksearch.FullQuickSearchService import com.normation.rudder.services.quicksearch.QSObject import com.normation.rudder.services.quicksearch.QuickSearchResult import com.normation.rudder.users.CurrentUser import com.normation.rudder.users.UserService import com.normation.rudder.web.model.LinkUtil -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.rest.RestHelper import net.liftweb.json.JArray -import net.liftweb.json.JsonAST._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonAST.* +import net.liftweb.json.JsonDSL.* import scala.collection.Seq /** @@ -109,7 +109,7 @@ class RestQuicksearch( } private[this] def filter(results: Set[QuickSearchResult]) = { - import com.normation.rudder.services.quicksearch.QuickSearchResultId._ + import com.normation.rudder.services.quicksearch.QuickSearchResultId.* val user = userService.getCurrentUser @@ -206,10 +206,10 @@ class RestQuicksearch( import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.domain.policies.RuleId - import com.normation.rudder.services.quicksearch.QuickSearchResultId._ + import com.normation.rudder.services.quicksearch.QuickSearchResultId.* def toJson: JObject = { - import linkUtil._ + import linkUtil.* val url = r.id match { case QRNodeId(v) => nodeLink(NodeId(v)) case QRRuleId(v) => ruleLink(RuleId(RuleUid(v))) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala index 0065d8e9e04..3307052db70 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/RulesInternalAPI.scala @@ -3,8 +3,8 @@ package com.normation.rudder.rest.internal import com.normation.errors.EitherToIoResult import com.normation.errors.IOResult import com.normation.rudder.api.ApiVersion -import com.normation.rudder.apidata.JsonResponseObjects._ -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.JsonResponseObjects.* +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.domain.logger.TimingDebugLoggerPure import com.normation.rudder.domain.policies.Rule import com.normation.rudder.domain.policies.RuleId @@ -12,19 +12,19 @@ import com.normation.rudder.facts.nodes.NodeFactRepository import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.RoRuleRepository -import com.normation.rudder.rest.{RuleInternalApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken -import com.normation.rudder.rest.implicits._ -import com.normation.rudder.rest.lift._ +import com.normation.rudder.rest.RuleInternalApi as API +import com.normation.rudder.rest.implicits.* +import com.normation.rudder.rest.lift.* import com.normation.rudder.rule.category.RoRuleCategoryRepository import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.rule.category.RuleCategoryId import com.normation.zio.currentTimeMillis import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import zio.syntax._ +import zio.syntax.* class RulesInternalApi( ruleInternalApiService: RuleInternalApiService, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala index 54015488dc9..412dc8308c7 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/SharedFilesAPI.scala @@ -37,14 +37,14 @@ package com.normation.rudder.rest.internal -import better.files._ -import com.normation.box._ -import com.normation.errors._ +import better.files.* +import com.normation.box.* +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.rudder.rest.OldInternalApiAuthz import com.normation.rudder.rest.RestExtractorService import com.normation.rudder.rest.internal.SharedFilesAPI.sanitizePath -import com.normation.zio._ +import com.normation.zio.* import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.NoSuchFileException @@ -67,9 +67,9 @@ import net.liftweb.json.JsonAST.JString import net.liftweb.json.JsonAST.JValue import org.joda.time.DateTime import org.joda.time.Instant -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import zio.ZIO -import zio.syntax._ +import zio.syntax.* object SharedFilesAPI { def sanitizePath(path: String, baseFolder: File): IOResult[File] = { @@ -105,9 +105,9 @@ class SharedFilesAPI( } def serialize(file: File): IOResult[JValue] = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* IOResult.attempt(s"Error when serializing file ${file.name}") { - val date = new DateTime(Instant.ofEpochMilli(Files.getLastModifiedTime(file.path, File.LinkOptions.noFollow: _*).toMillis)) + val date = new DateTime(Instant.ofEpochMilli(Files.getLastModifiedTime(file.path, File.LinkOptions.noFollow*).toMillis)) (("name" -> file.name) ~ ("size" -> (try { file.size } catch { case _: NoSuchFileException => 0L })) @@ -117,7 +117,7 @@ class SharedFilesAPI( } } def errorResponse(message: String): LiftResponse = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* val content = { (("success" -> false) ~ ("error" -> message)) @@ -125,7 +125,7 @@ class SharedFilesAPI( JsonResponse(content, Nil, Nil, 500) } val basicSuccessResponse: LiftResponse = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* val content = { (("success" -> true) ~ ("error" -> JNull)) @@ -174,7 +174,7 @@ class SharedFilesAPI( IOResult.attemptZIO { if (file.exists) { if (file.isRegularFile) { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* val result = JObject(List(JField("result", file.contentAsString(StandardCharsets.UTF_8)))) JsonResponse(result, List(), List(), 200).succeed } else { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala index 713b4f146d0..eb6d4db0343 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala @@ -49,14 +49,14 @@ import com.normation.cfclerk.services.TechniqueRepository import com.normation.cfclerk.services.TechniquesInfo import com.normation.cfclerk.services.UpdateTechniqueLibrary import com.normation.cfclerk.xmlparsers.TechniqueParser -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.EventMetadata import com.normation.rudder.api.ApiVersion import com.normation.rudder.apidata.JsonResponseObjects.JRDirective import com.normation.rudder.apidata.JsonResponseObjects.JRGroup import com.normation.rudder.apidata.JsonResponseObjects.JRRule -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.configuration.ConfigurationRepository @@ -86,15 +86,15 @@ import com.normation.rudder.repository.WoRuleRepository import com.normation.rudder.repository.xml.TechniqueArchiverImpl import com.normation.rudder.repository.xml.TechniqueFiles import com.normation.rudder.repository.xml.TechniqueRevisionRepository -import com.normation.rudder.rest.{ArchiveApi => API} import com.normation.rudder.rest.ApiPath +import com.normation.rudder.rest.ArchiveApi as API import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.RudderJsonResponse import com.normation.rudder.rest.RudderJsonResponse.ResponseSchema -import com.normation.rudder.rest.implicits._ -import com.normation.rudder.rest.lift.ImportAnswer._ +import com.normation.rudder.rest.implicits.* +import com.normation.rudder.rest.lift.ImportAnswer.* import com.normation.rudder.services.queries.CmdbQueryParser -import com.normation.zio._ +import com.normation.zio.* import java.io.ByteArrayInputStream import java.io.InputStream import java.io.OutputStream @@ -108,9 +108,9 @@ import net.liftweb.http.OutputStreamResponse import net.liftweb.http.Req import scala.util.matching.Regex import scala.xml.XML -import zio._ -import zio.json._ -import zio.syntax._ +import zio.* +import zio.json.* +import zio.syntax.* /* * Machinery to enable/disable the API given the value of the feature switch in config service. @@ -336,7 +336,7 @@ class ArchiveApi( */ object ImportAnswer { - import zio.json._ + import zio.json.* case class JRArchiveImported(success: Boolean) @@ -512,7 +512,7 @@ class ZipArchiveBuilderService( ): IOResult[Chunk[Zippable]] = { // normalize to no slash at end val root = rootDirName.strip().replaceAll("""/$""", "") - import ArchiveScope._ + import ArchiveScope.* val includeDepTechniques = scopes.intersect(Set(AllDep, Techniques)).nonEmpty // scope is transitive, techniques implies directives val includeDepDirectives = includeDepTechniques || scopes.intersect(Set(AllDep, Directives)).nonEmpty @@ -725,7 +725,7 @@ class ZipArchiveReaderImpl( cmdbQueryParser: CmdbQueryParser, techniqueParser: TechniqueParser ) extends ZipArchiveReader { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* // we must avoid to eagerly match "ncf_techniques" as "techniques" but still accept when it starts by "techniques" without / val techniqueRegex: Regex = """(.*/|)techniques/(.+)""".r @@ -774,9 +774,9 @@ class ZipArchiveReaderImpl( name: String, content: Array[Byte] ): IOResult[(String, Array[Byte])] = { - import YamlTechniqueSerializer._ - import com.normation.rudder.ncf.yaml.{Technique => YTechnique} - import zio.json.yaml._ + import YamlTechniqueSerializer.* + import com.normation.rudder.ncf.yaml.Technique as YTechnique + import zio.json.yaml.* // when the technique is a YAML technique, we need to check that technique ID matches technique path def checkYamlIdMatchesPath(path: String, tech: YTechnique, id: TechniqueId): IOResult[Unit] = { @@ -969,7 +969,7 @@ class ZipArchiveReaderImpl( } // now, parse everything and collect errors - import com.normation.rudder.apidata.JsonResponseObjectDecodes._ + import com.normation.rudder.apidata.JsonResponseObjectDecodes.* for { _ <- ApplicationLoggerPure.Archive.debug( s"Processing archive '${archiveName}': techniques: '${techniqueUnzips.keys.mkString("', '")}'" @@ -990,7 +990,7 @@ class ZipArchiveReaderImpl( // aggregate errors policies <- withRules.errors.toList match { case Nil => withRules.policies.succeed - case h :: tail => Accumulated(NonEmptyList.of(h, tail: _*)).fail + case h :: tail => Accumulated(NonEmptyList.of(h, tail*)).fail } } yield policies } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala index cebbb836159..61d64db9484 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala @@ -10,16 +10,16 @@ import com.normation.rudder.campaigns.CampaignId import com.normation.rudder.campaigns.CampaignLogger import com.normation.rudder.campaigns.CampaignRepository import com.normation.rudder.campaigns.CampaignSerializer -import com.normation.rudder.campaigns.CampaignSerializer._ +import com.normation.rudder.campaigns.CampaignSerializer.* import com.normation.rudder.campaigns.CampaignStatusValue import com.normation.rudder.campaigns.MainCampaignService -import com.normation.rudder.rest.{CampaignApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken +import com.normation.rudder.rest.CampaignApi as API import com.normation.rudder.rest.OneParam import com.normation.rudder.rest.RestExtractorService -import com.normation.rudder.rest.implicits._ +import com.normation.rudder.rest.implicits.* import com.normation.utils.DateFormaterService import com.normation.utils.StringUuidGenerator import net.liftweb.common.EmptyBox @@ -28,7 +28,7 @@ import net.liftweb.http.LiftResponse import net.liftweb.http.Req import org.joda.time.DateTime import zio.ZIO -import zio.syntax._ +import zio.syntax.* class CampaignApi( campaignRepository: CampaignRepository, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala index 0118ffec0eb..aa6805cdf64 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala @@ -37,8 +37,8 @@ package com.normation.rudder.rest.lift -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.domain.NodeId import com.normation.rudder.api.ApiVersion import com.normation.rudder.domain.logger.TimingDebugLogger @@ -74,25 +74,25 @@ import com.normation.rudder.repository.FullActiveTechnique import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.RoRuleRepository -import com.normation.rudder.rest._ -import com.normation.rudder.rest.{ComplianceApi => API} +import com.normation.rudder.rest.* +import com.normation.rudder.rest.ComplianceApi as API import com.normation.rudder.rest.RestExtractorService -import com.normation.rudder.rest.RestUtils._ -import com.normation.rudder.rest.data._ +import com.normation.rudder.rest.RestUtils.* +import com.normation.rudder.rest.data.* import com.normation.rudder.services.reports.ReportingService import com.normation.rudder.web.services.ComputePolicyMode import com.normation.zio.currentTimeMillis -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.LiftResponse import net.liftweb.http.PlainTextResponse import net.liftweb.http.Req -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import scala.collection.MapView import scala.collection.immutable import zio.Chunk import zio.ZIO -import zio.syntax._ +import zio.syntax.* class ComplianceApi( restExtractorService: RestExtractorService, @@ -100,8 +100,8 @@ class ComplianceApi( readDirective: RoDirectiveRepository ) extends LiftApiModuleProvider[API] { - import CsvCompliance._ - import JsonCompliance._ + import CsvCompliance.* + import JsonCompliance.* def schemas: ApiModuleProvider[API] = API diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala index 0924278c396..8aee8b7e25f 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala @@ -38,22 +38,22 @@ package com.normation.rudder.rest.lift import com.normation.GitVersion -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.Technique import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.services.TechniqueRepository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.api.ApiVersion -import com.normation.rudder.apidata.JsonQueryObjects._ -import com.normation.rudder.apidata.JsonResponseObjects._ +import com.normation.rudder.apidata.JsonQueryObjects.* +import com.normation.rudder.apidata.JsonResponseObjects.* import com.normation.rudder.apidata.JsonResponseObjects.JRDirective import com.normation.rudder.apidata.RestDataSerializer import com.normation.rudder.apidata.ZioJsonExtractor -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.configuration.ConfigurationRepository @@ -69,30 +69,30 @@ import com.normation.rudder.domain.workflows.ChangeRequestId import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.WoDirectiveRepository -import com.normation.rudder.rest._ -import com.normation.rudder.rest.{DirectiveApi => API} +import com.normation.rudder.rest.* import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken +import com.normation.rudder.rest.DirectiveApi as API import com.normation.rudder.rest.RestExtractorService import com.normation.rudder.rest.RestUtils -import com.normation.rudder.rest.data._ -import com.normation.rudder.rest.implicits._ +import com.normation.rudder.rest.data.* +import com.normation.rudder.rest.implicits.* import com.normation.rudder.services.workflows.ChangeRequestService import com.normation.rudder.services.workflows.DGModAction import com.normation.rudder.services.workflows.DirectiveChangeRequest import com.normation.rudder.services.workflows.WorkflowLevelService import com.normation.rudder.web.model.DirectiveEditor import com.normation.rudder.web.services.DirectiveEditorService -import com.normation.utils.Control._ +import com.normation.utils.Control.* import com.normation.utils.StringUuidGenerator -import com.softwaremill.quicklens._ -import net.liftweb.common._ +import com.softwaremill.quicklens.* +import net.liftweb.common.* import net.liftweb.http.LiftResponse import net.liftweb.http.Req import net.liftweb.json.JArray import net.liftweb.json.JsonAST.JValue -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class DirectiveApi( readDirective: RoDirectiveRepository, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala index 98172371b45..ec38e7676dc 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala @@ -37,22 +37,22 @@ package com.normation.rudder.rest.lift -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.api.ApiVersion import com.normation.rudder.apidata.FullDetails -import com.normation.rudder.apidata.JsonQueryObjects._ -import com.normation.rudder.apidata.JsonResponseObjects._ +import com.normation.rudder.apidata.JsonQueryObjects.* +import com.normation.rudder.apidata.JsonResponseObjects.* import com.normation.rudder.apidata.MinimalDetails import com.normation.rudder.apidata.RenderInheritedProperties import com.normation.rudder.apidata.RestDataSerializer import com.normation.rudder.apidata.ZioJsonExtractor -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.properties.NodePropertyHierarchy import com.normation.rudder.domain.properties.ParentProperty import com.normation.rudder.facts.nodes.NodeFactRepository @@ -61,26 +61,26 @@ import com.normation.rudder.repository.CategoryAndNodeGroup import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.RoParameterRepository import com.normation.rudder.repository.WoNodeGroupRepository -import com.normation.rudder.rest._ -import com.normation.rudder.rest.{GroupApi => API} +import com.normation.rudder.rest.* +import com.normation.rudder.rest.GroupApi as API import com.normation.rudder.rest.RestExtractorService -import com.normation.rudder.rest.RestUtils._ -import com.normation.rudder.rest.data._ -import com.normation.rudder.rest.implicits._ +import com.normation.rudder.rest.RestUtils.* +import com.normation.rudder.rest.data.* +import com.normation.rudder.rest.implicits.* import com.normation.rudder.services.nodes.MergeNodeProperties import com.normation.rudder.services.queries.CmdbQueryParser import com.normation.rudder.services.queries.QueryProcessor -import com.normation.rudder.services.workflows._ +import com.normation.rudder.services.workflows.* import com.normation.rudder.users.UserService import com.normation.utils.StringUuidGenerator -import com.normation.zio._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.common.* import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import zio.ZIO -import zio.syntax._ +import zio.syntax.* class GroupsApi( readGroup: RoNodeGroupRepository, @@ -264,8 +264,8 @@ class GroupsApi( } } - import RestUtils._ - import net.liftweb.json._ + import RestUtils.* + import net.liftweb.json.* def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit action: String @@ -681,7 +681,7 @@ class GroupApiInheritedProperties( params <- paramRepo.getAllGlobalParameters() properties <- MergeNodeProperties.forGroup(groupId, allGroups, params.map(p => (p.name, p)).toMap).toIO } yield { - import com.normation.rudder.domain.properties.JsonPropertySerialisation._ + import com.normation.rudder.domain.properties.JsonPropertySerialisation.* val rendered = renderInHtml match { case RenderInheritedProperties.HTML => properties.toApiJsonRenderParents case RenderInheritedProperties.JSON => properties.toApiJson @@ -708,8 +708,8 @@ class GroupApiService2( )(implicit userService: UserService) extends Loggable { - import RestUtils._ - import restDataSerializer._ + import RestUtils.* + import restDataSerializer.* private[this] def createChangeRequestAndAnswer( id: String, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala index 5494cb0ff12..b90cbbd967d 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala @@ -4,16 +4,16 @@ import better.files.File import com.normation.errors.IOResult import com.normation.rudder.api.ApiVersion import com.normation.rudder.apidata.JsonResponseObjects.JRHooks -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.hooks.RunHooks -import com.normation.rudder.rest.{HookApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken -import com.normation.rudder.rest.implicits._ +import com.normation.rudder.rest.HookApi as API +import com.normation.rudder.rest.implicits.* import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import zio._ +import zio.* class HookApi( apiVService: HookApiService diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala index 00e98b4fd73..0c4cf5f5297 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala @@ -39,12 +39,12 @@ package com.normation.rudder.rest.lift import com.normation.rudder.api.ApiVersion import com.normation.rudder.api.HttpAction -import com.normation.rudder.rest._ -import com.normation.rudder.rest.{InfoApi => API} +import com.normation.rudder.rest.* +import com.normation.rudder.rest.InfoApi as API import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* /* * Information about the API diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala index e157568b318..121ee29036d 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala @@ -37,26 +37,26 @@ package com.normation.rudder.rest.lift -import better.files._ -import com.normation.errors._ +import better.files.* +import com.normation.errors.* import com.normation.rudder.api.ApiVersion import com.normation.rudder.inventory.InventoryFileWatcher -import com.normation.rudder.rest.{InventoryApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken +import com.normation.rudder.rest.InventoryApi as API import com.normation.rudder.rest.RestError import com.normation.rudder.rest.RestExtractorService import com.normation.rudder.rest.RestUtils.effectiveResponse import com.normation.rudder.rest.RestUtils.toJsonError import com.normation.rudder.rest.RestUtils.toJsonResponse -import com.normation.rudder.rest.implicits._ +import com.normation.rudder.rest.implicits.* import net.liftweb.http.FileParamHolder import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import net.liftweb.json.JsonDSL._ -import zio._ -import zio.syntax._ +import net.liftweb.json.JsonDSL.* +import zio.* +import zio.syntax.* class InventoryApi( restExtractorService: RestExtractorService, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala index e45fc6e8b2c..50b98443e13 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala @@ -37,13 +37,13 @@ package com.normation.rudder.rest.lift -import cats.data._ +import cats.data.* import com.normation.rudder.api.ApiVersion import com.normation.rudder.api.HttpAction import com.normation.rudder.domain.logger.ApiLogger -import com.normation.rudder.rest._ -import net.liftweb.common._ -import net.liftweb.http._ +import com.normation.rudder.rest.* +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.rest.RestHelper import net.liftweb.json.JsonAST.JString import scala.util.control.NonFatal @@ -209,7 +209,7 @@ class LiftHandler( def getRequestInfo(req: Req, supportedVersions: List[ApiVersion]): Either[ApiError, RequestInfo] = { def getAction() = { - import HttpAction._ + import HttpAction.* req.requestType match { case GetRequest => Right(GET) case PostRequest => Right(POST) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala index e7fb9f93cf7..cc991c3fa2e 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala @@ -40,10 +40,11 @@ package com.normation.rudder.rest.lift import cats.data.Validated.Invalid import cats.data.Validated.Valid import cats.data.ValidatedNel -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* +import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId -import com.normation.inventory.domain._ +import com.normation.inventory.domain.* import com.normation.inventory.domain.NodeId import com.normation.inventory.ldap.core.InventoryDit import com.normation.ldap.sdk.LDAPConnectionProvider @@ -84,10 +85,10 @@ import com.normation.rudder.repository.RoParameterRepository import com.normation.rudder.repository.json.DataExtractor.CompleteJson import com.normation.rudder.repository.json.DataExtractor.OptionnalJson import com.normation.rudder.repository.ldap.LDAPEntityMapper -import com.normation.rudder.rest.{NodeApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken +import com.normation.rudder.rest.NodeApi as API import com.normation.rudder.rest.NotFoundError import com.normation.rudder.rest.OneParam import com.normation.rudder.rest.RestExtractorService @@ -95,7 +96,7 @@ import com.normation.rudder.rest.RestUtils import com.normation.rudder.rest.RestUtils.effectiveResponse import com.normation.rudder.rest.RestUtils.toJsonError import com.normation.rudder.rest.RestUtils.toJsonResponse -import com.normation.rudder.rest.data._ +import com.normation.rudder.rest.data.* import com.normation.rudder.rest.data.Creation.CreationError import com.normation.rudder.rest.data.NodeSetup import com.normation.rudder.rest.data.NodeTemplate @@ -113,14 +114,14 @@ import com.normation.rudder.score.ScoreService import com.normation.rudder.score.ScoreValue import com.normation.rudder.services.nodes.MergeNodeProperties import com.normation.rudder.services.nodes.NodeInfoService -import com.normation.rudder.services.queries._ +import com.normation.rudder.services.queries.* import com.normation.rudder.services.reports.ReportingService import com.normation.rudder.services.servers.DeleteMode import com.normation.rudder.services.servers.NewNodeManager import com.normation.rudder.services.servers.RemoveNodeService import com.normation.utils.DateFormaterService import com.normation.utils.StringUuidGenerator -import com.normation.zio._ +import com.normation.zio.* import com.typesafe.config.ConfigValue import java.io.ByteArrayInputStream import java.io.InputStream @@ -146,7 +147,7 @@ import net.liftweb.json.JsonAST.JField import net.liftweb.json.JsonAST.JInt import net.liftweb.json.JsonAST.JObject import net.liftweb.json.JsonAST.JString -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import net.liftweb.json.JsonDSL.pair2jvalue import net.liftweb.json.JsonDSL.string2jvalue import net.liftweb.json.JValue @@ -155,9 +156,9 @@ import scala.collection.MapView import scalaj.http.Http import scalaj.http.HttpOptions import scalaj.http.HttpRequest -import zio.{System => _, _} +import zio.{System as _, *} import zio.stream.ZSink -import zio.syntax._ +import zio.syntax.* /* * NodeApi implementation. @@ -213,12 +214,12 @@ class NodeApi( val schema: API.CreateNodes.type = API.CreateNodes val restExtractor = restExtractorService - import ResultHolder._ - import com.normation.rudder.rest.data.Rest.JsonCodecNodeDetails._ - import zio.json._ + import ResultHolder.* + import com.normation.rudder.rest.data.Rest.JsonCodecNodeDetails.* + import zio.json.* def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* (for { json <- (if (req.json_?) req.body else Failure("This API only Accept JSON request")).toIO nodes <- new String(json, StandardCharsets.UTF_8).fromJson[List[NodeDetails]].toIO @@ -609,8 +610,8 @@ class NodeApi( params: DefaultParams, authzToken: AuthzToken ): LiftResponse = { - import ScoreSerializer._ - import com.normation.rudder.rest.implicits._ + import ScoreSerializer.* + import com.normation.rudder.rest.implicits.* (for { score <- nodeApiService.getNodeGlobalScore(NodeId(id)) } yield { @@ -631,8 +632,8 @@ class NodeApi( params: DefaultParams, authzToken: AuthzToken ): LiftResponse = { - import ScoreSerializer._ - import com.normation.rudder.rest.implicits._ + import ScoreSerializer.* + import com.normation.rudder.rest.implicits.* nodeApiService.getNodeDetailsScore(NodeId(id)).toLiftResponseOne(params, schema, _ => Some(id)) } } @@ -651,8 +652,8 @@ class NodeApi( ): LiftResponse = { // implicit val action = "getNodeGlobalScore" // implicit val prettify = params.prettify - import ScoreSerializer._ - import com.normation.rudder.rest.implicits._ + import ScoreSerializer.* + import com.normation.rudder.rest.implicits.* val (nodeId, scoreId) = id (for { allDetails <- nodeApiService.getNodeDetailsScore(NodeId(nodeId)) @@ -775,7 +776,7 @@ class NodeApiInheritedProperties( ) }) } yield { - import com.normation.rudder.domain.properties.JsonPropertySerialisation._ + import com.normation.rudder.domain.properties.JsonPropertySerialisation.* def hierarchyStatus(propName: String) = propertiesDetails.get(propName).map { case (hierarchy, hasConflicts) => ("hierarchyStatus" -> @@ -940,7 +941,7 @@ class NodeApiService( } def mergeNodeSetup(node: Node, changes: NodeSetup): Node = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* // for properties, we don't want to modify any of the existing one because // we were put during acceptation (or since node is live). @@ -985,7 +986,7 @@ class NodeApiService( (for { ldap <- ldapConnection // try t get node - entry <- ldap.get(nodeDit.NODES.NODE.dn(id.value), NodeInfoService.nodeInfoAttributes: _*) + entry <- ldap.get(nodeDit.NODES.NODE.dn(id.value), NodeInfoService.nodeInfoAttributes*) current <- entry match { case Some(x) => ldapEntityMapper.entryToNode(x).toIO case None => default().succeed @@ -1048,7 +1049,7 @@ class NodeApiService( def escapeHTML(s: String): String = JsExp.strToJsExp(xml.Utility.escape(s)).str - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* def toComplianceArray(comp: ComplianceLevel): JArray = { val pc = comp.computePercent() JArray( @@ -1080,7 +1081,7 @@ class NodeApiService( (globalPolicyMode.mode, "none") } } - import com.normation.rudder.domain.properties.JsonPropertySerialisation._ + import com.normation.rudder.domain.properties.JsonPropertySerialisation.* val jsonScore = ("score" -> score.value.value) ~ ("details" -> JObject(score.details.map(s => JField(s.scoreId, s.value.value)))) @@ -1206,7 +1207,7 @@ class NodeApiService( } def software(req: Req, software: String)(implicit qc: QueryContext): ZIO[Any, RudderError, LiftResponse] = { - import com.normation.box._ + import com.normation.box.* for { optNodeIds <- req.json.flatMap(restExtractor.extractNodeIdsFromJson).toIO @@ -1239,7 +1240,7 @@ class NodeApiService( for { inheritedProp <- getNodesPropertiesTree(nodes, List(property)) } yield { - import com.normation.rudder.domain.properties.JsonPropertySerialisation._ + import com.normation.rudder.domain.properties.JsonPropertySerialisation.* inheritedProp.map { case (k, v) => (k, v.map(_.toApiJsonRenderParents)) } } } else { @@ -1510,7 +1511,7 @@ class NodeApiService( newKey: Option[SecurityToken], newKeyStatus: Option[KeyStatus] ): CoreNodeFact = { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* node .modify(_.properties) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala index f6204e58cea..8160d0c65f2 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala @@ -38,8 +38,8 @@ package com.normation.rudder.rest.lift import com.normation.GitVersion -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.eventlog.EventActor import com.normation.rudder.api.ApiVersion @@ -47,23 +47,23 @@ import com.normation.rudder.apidata.JsonQueryObjects.JQGlobalParameter import com.normation.rudder.apidata.JsonResponseObjects.JRGlobalParameter import com.normation.rudder.apidata.RestDataSerializer import com.normation.rudder.apidata.ZioJsonExtractor -import com.normation.rudder.apidata.implicits._ -import com.normation.rudder.domain.properties._ +import com.normation.rudder.apidata.implicits.* +import com.normation.rudder.domain.properties.* import com.normation.rudder.domain.properties.ChangeRequestGlobalParameterDiff import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.repository.RoParameterRepository import com.normation.rudder.repository.WoParameterRepository -import com.normation.rudder.rest.{ParameterApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken +import com.normation.rudder.rest.ParameterApi as API import com.normation.rudder.rest.RestExtractorService import com.normation.rudder.rest.RestUtils import com.normation.rudder.rest.RestUtils.getActor import com.normation.rudder.rest.RestUtils.toJsonError import com.normation.rudder.rest.RestUtils.toJsonResponse import com.normation.rudder.rest.data.RestParameter -import com.normation.rudder.rest.implicits._ +import com.normation.rudder.rest.implicits.* import com.normation.rudder.services.workflows.ChangeRequestService import com.normation.rudder.services.workflows.GlobalParamChangeRequest import com.normation.rudder.services.workflows.GlobalParamModAction @@ -77,9 +77,9 @@ import net.liftweb.common.Loggable import net.liftweb.http.LiftResponse import net.liftweb.http.Req import net.liftweb.json.JArray -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import net.liftweb.json.JString -import zio.syntax._ +import zio.syntax.* class ParameterApi( restExtractorService: RestExtractorService, @@ -286,7 +286,7 @@ class ParameterApiService2( )(implicit userService: UserService) extends Loggable { - import restDataSerializer.{serializeParameter => serialize} + import restDataSerializer.serializeParameter as serialize private[this] def createChangeRequestAndAnswer( id: String, @@ -347,7 +347,7 @@ class ParameterApiService2( restParameter match { case Full(restParameter) => - import GenericProperty._ + import GenericProperty.* val parameter = restParameter.updateParameter(GlobalParameter(parameterName, GitVersion.DEFAULT_REV, "".toConfigValue, None, "", None)) @@ -477,7 +477,7 @@ class ParameterApiService14( } def createParameter(restParameter: JQGlobalParameter, params: DefaultParams, actor: EventActor): IOResult[JRGlobalParameter] = { - import GenericProperty._ + import GenericProperty.* val baseParameter = GlobalParameter.apply("", GitVersion.DEFAULT_REV, "".toConfigValue, None, "", None) val parameter = restParameter.updateParameter(baseParameter) val diff = AddGlobalParameterDiff(parameter) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala index 63f82f61ba7..aaee3a50721 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala @@ -40,10 +40,10 @@ package com.normation.rudder.rest.lift import com.normation.plugins.PluginSettings import com.normation.plugins.PluginSettingsService import com.normation.rudder.api.ApiVersion -import com.normation.rudder.rest.{PluginApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken +import com.normation.rudder.rest.PluginApi as API import com.normation.rudder.rest.RestExtractorService import com.normation.rudder.rest.RestUtils import net.liftweb.http.LiftResponse @@ -71,11 +71,11 @@ class PluginApi( val schema: API.GetPluginsSettings.type = API.GetPluginsSettings val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { - import com.normation.box._ + import com.normation.box.* val json = for { conf <- pluginSettingsService.readPluginSettings() } yield { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* (("username" -> conf.username) ~ ("password" -> conf.password) ~ ("url" -> conf.url) @@ -101,8 +101,8 @@ class PluginApi( val schema: API.UpdatePluginsSettings.type = API.UpdatePluginsSettings val restExtractor = restExtractorService def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = { - import com.normation.box._ - import com.normation.errors._ + import com.normation.box.* + import com.normation.errors.* implicit val formats = DefaultFormats val json = { @@ -112,7 +112,7 @@ class PluginApi( _ <- pluginSettingsService.writePluginSettings(conf) } yield { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* (("username" -> conf.username) ~ ("password" -> conf.password) ~ ("url" -> conf.url) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RecentChangesAPI.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RecentChangesAPI.scala index b5389bf7774..a16b02258b3 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RecentChangesAPI.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RecentChangesAPI.scala @@ -45,19 +45,19 @@ import com.normation.rudder.api.ApiVersion import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.policies.RuleUid import com.normation.rudder.domain.reports.ResultRepairedReport -import com.normation.rudder.rest.{ChangesApi => API} import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.ChangesApi +import com.normation.rudder.rest.ChangesApi as API import com.normation.rudder.rest.RestExtractorService -import com.normation.rudder.rest.RestUtils._ +import com.normation.rudder.rest.RestUtils.* import com.normation.rudder.services.reports.NodeChangesService import com.normation.utils.DateFormaterService -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.LiftResponse import net.liftweb.http.Req import net.liftweb.json.JsonAST.JValue -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import org.joda.time.DateTime import org.joda.time.Interval import zio.syntax.ToZio diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala index 09caa295b40..dbc88c95a0d 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala @@ -38,20 +38,20 @@ package com.normation.rudder.rest.lift import com.normation.GitVersion -import com.normation.box._ -import com.normation.errors._ -import com.normation.eventlog._ +import com.normation.box.* +import com.normation.errors.* +import com.normation.eventlog.* import com.normation.eventlog.EventActor import com.normation.inventory.domain.NodeId import com.normation.rudder.api.ApiVersion import com.normation.rudder.apidata.DetailLevel import com.normation.rudder.apidata.FullDetails -import com.normation.rudder.apidata.JsonQueryObjects._ -import com.normation.rudder.apidata.JsonResponseObjects._ +import com.normation.rudder.apidata.JsonQueryObjects.* +import com.normation.rudder.apidata.JsonResponseObjects.* import com.normation.rudder.apidata.MinimalDetails import com.normation.rudder.apidata.RestDataSerializer import com.normation.rudder.apidata.ZioJsonExtractor -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.configuration.ConfigurationRepository @@ -73,8 +73,7 @@ import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.RoRuleRepository import com.normation.rudder.repository.WoRuleRepository -import com.normation.rudder.rest._ -import com.normation.rudder.rest.{RuleApi => API} +import com.normation.rudder.rest.* import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.RestExtractorService @@ -82,9 +81,10 @@ import com.normation.rudder.rest.RestUtils import com.normation.rudder.rest.RestUtils.getActor import com.normation.rudder.rest.RestUtils.toJsonError import com.normation.rudder.rest.RestUtils.toJsonResponse -import com.normation.rudder.rest.data._ -import com.normation.rudder.rest.implicits._ -import com.normation.rudder.rule.category._ +import com.normation.rudder.rest.RuleApi as API +import com.normation.rudder.rest.data.* +import com.normation.rudder.rest.implicits.* +import com.normation.rudder.rule.category.* import com.normation.rudder.rule.category.RuleCategoryId import com.normation.rudder.services.policies.RuleApplicationStatusService import com.normation.rudder.services.workflows.ChangeRequestService @@ -100,12 +100,12 @@ import net.liftweb.common.Full import net.liftweb.common.Loggable import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import net.liftweb.json._ +import net.liftweb.json.* import net.liftweb.json.JArray -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import scala.collection.MapView -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class RuleApi( restExtractorService: RestExtractorService, @@ -116,7 +116,7 @@ class RuleApi( uuidGen: StringUuidGenerator ) extends LiftApiModuleProvider[API] { - import RestUtils._ + import RestUtils.* def response(function: Box[JValue], req: Req, errorMessage: String, dataName: String)(implicit action: String): LiftResponse = { RestUtils.response(restExtractorService, dataName, None)(function, req, errorMessage) @@ -567,7 +567,7 @@ class RuleApiService2( restDataSerializer: RestDataSerializer )(implicit userService: UserService) { - import restDataSerializer.{serializeRule => serialize} + import restDataSerializer.serializeRule as serialize private[this] def createChangeRequestAndAnswer( id: String, @@ -1179,7 +1179,7 @@ class RuleApiService14( def recFind(root: RuleCategory, id: RuleCategoryId): Option[(RuleCategory, RuleCategory)] = { root.childs.foldLeft(Option.empty[(RuleCategory, RuleCategory)]) { case (None, cat) => if (cat.id == id) Some((root, cat)) else recFind(cat, id) - case (x: Some[_], _) => x + case (x: Some[?], _) => x } } for { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala index b8ebe581169..1bbf463fb86 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala @@ -39,8 +39,8 @@ package com.normation.rudder.rest.lift import com.normation.appconfig.ReadConfigService import com.normation.appconfig.UpdateConfigService -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId @@ -51,37 +51,37 @@ import com.normation.rudder.batch.PolicyGenerationTrigger import com.normation.rudder.domain.appconfig.FeatureSwitch import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.domain.policies.PolicyMode -import com.normation.rudder.reports._ -import com.normation.rudder.rest.{SettingsApi => API} +import com.normation.rudder.reports.* import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken import com.normation.rudder.rest.OneParam import com.normation.rudder.rest.RestExtractorService import com.normation.rudder.rest.RestUtils +import com.normation.rudder.rest.SettingsApi as API import com.normation.rudder.services.nodes.NodeInfoService import com.normation.rudder.services.policies.SendMetrics import com.normation.rudder.services.reports.UnexpectedReportBehavior import com.normation.rudder.services.servers.AllowedNetwork import com.normation.rudder.services.servers.PolicyServerManagementService import com.normation.rudder.services.servers.RelaySynchronizationMethod -import com.normation.rudder.services.servers.RelaySynchronizationMethod._ +import com.normation.rudder.services.servers.RelaySynchronizationMethod.* import com.normation.utils.Control.bestEffort import com.normation.utils.Control.traverse import com.normation.utils.StringUuidGenerator -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Box import net.liftweb.common.EmptyBox import net.liftweb.common.Failure import net.liftweb.common.Full import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import net.liftweb.json._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.* +import net.liftweb.json.JsonDSL.* import scala.concurrent.duration.Duration import scala.util.control.NonFatal -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* class SettingsApi( val restExtractorService: RestExtractorService, @@ -92,7 +92,7 @@ class SettingsApi( val nodeInfoService: NodeInfoService ) extends LiftApiModuleProvider[API] { - val allSettings_v10: List[RestSetting[_]] = { + val allSettings_v10: List[RestSetting[?]] = { RestPolicyMode :: RestPolicyModeOverridable :: RestRunFrequency :: @@ -134,9 +134,9 @@ class SettingsApi( Nil } - val allSettings_v12: List[RestSetting[_]] = RestReportProtocolDefault :: allSettings_v10 + val allSettings_v12: List[RestSetting[?]] = RestReportProtocolDefault :: allSettings_v10 - def allSettings(version: ApiVersion): List[RestSetting[_]] = { + def allSettings(version: ApiVersion): List[RestSetting[?]] = { if (version.value <= 10) { allSettings_v10 } else { @@ -265,7 +265,7 @@ class SettingsApi( /////////////// Utility function and definition for each setting /////////////// - def settingFromKey(key: String, modules: List[RestSetting[_]]): Box[RestSetting[_]] = { + def settingFromKey(key: String, modules: List[RestSetting[?]]): Box[RestSetting[?]] = { modules.find(_.key == key) match { case Some(setting) => Full(setting) case None => Failure(s"'$key' is not a valid settings key") @@ -860,7 +860,7 @@ class SettingsApi( case (_, ("root", _)) => false case ((a, _), (b, _)) => a < b } - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* JArray(toKeep.toList.map { case (nodeid, networks) => ("id" -> nodeid) ~ ("allowed_networks" -> networks.toList.sorted) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala index 838d0489942..ff0a2b319c4 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala @@ -37,9 +37,9 @@ package com.normation.rudder.rest.lift -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.services.UpdateTechniqueLibrary -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.ldap.core.SoftwareService @@ -54,7 +54,6 @@ import com.normation.rudder.git.GitCommitId import com.normation.rudder.git.GitFindUtils import com.normation.rudder.git.GitRepositoryProvider import com.normation.rudder.repository.ItemArchiveManager -import com.normation.rudder.rest.{SystemApi => API} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.ApiPath import com.normation.rudder.rest.AuthzToken @@ -65,6 +64,7 @@ import com.normation.rudder.rest.RestUtils import com.normation.rudder.rest.RestUtils.getActor import com.normation.rudder.rest.RestUtils.toJsonError import com.normation.rudder.rest.RestUtils.toJsonResponse +import com.normation.rudder.rest.SystemApi as API import com.normation.rudder.services.ClearCacheService import com.normation.rudder.services.healthcheck.HealthcheckNotificationService import com.normation.rudder.services.healthcheck.HealthcheckService @@ -74,21 +74,21 @@ import com.normation.rudder.services.user.PersonIdentService import com.normation.rudder.users.UserService import com.normation.utils.DateFormaterService import com.normation.utils.StringUuidGenerator -import com.normation.zio._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.common.* import net.liftweb.http.InMemoryResponse import net.liftweb.http.LiftResponse import net.liftweb.http.Req import net.liftweb.json.JsonAST.JArray import net.liftweb.json.JsonAST.JField import net.liftweb.json.JsonAST.JObject -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonDSL.* import org.eclipse.jgit.lib.PersonIdent import org.eclipse.jgit.revwalk.RevWalk import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat import org.joda.time.format.DateTimeFormatterBuilder -import zio._ +import zio.* class SystemApi( restExtractorService: RestExtractorService, diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala index 28575b3e5b2..a0d228e1bf9 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala @@ -38,42 +38,42 @@ package com.normation.rudder.rest.lift import better.files.File -import com.normation.box._ -import com.normation.cfclerk.domain._ +import com.normation.box.* +import com.normation.cfclerk.domain.* import com.normation.cfclerk.services.TechniqueRepository -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.api.ApiVersion -import com.normation.rudder.apidata.JsonResponseObjects._ +import com.normation.rudder.apidata.JsonResponseObjects.* import com.normation.rudder.apidata.RestDataSerializer -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.domain.logger.ApiLoggerPure import com.normation.rudder.domain.policies.Directive -import com.normation.rudder.ncf._ +import com.normation.rudder.ncf.* import com.normation.rudder.ncf.BundleName import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.xml.TechniqueRevisionRepository -import com.normation.rudder.rest.{TechniqueApi => API, _} +import com.normation.rudder.rest.{TechniqueApi as API, *} import com.normation.rudder.rest.RestUtils.ActionType import com.normation.rudder.rest.RestUtils.response -import com.normation.rudder.rest.implicits._ +import com.normation.rudder.rest.implicits.* import com.normation.rudder.rest.lift.TechniqueApi.QueryFormat import com.normation.utils.ParseVersion import com.normation.utils.StringUuidGenerator import com.normation.utils.Version import java.nio.charset.StandardCharsets -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.LiftResponse import net.liftweb.http.Req -import net.liftweb.json.JsonAST._ +import net.liftweb.json.JsonAST.* import scala.collection.SortedMap -import zio._ +import zio.* import zio.json.ast.Json import zio.json.ast.Json.Str -import zio.json.yaml._ -import zio.syntax._ +import zio.json.yaml.* +import zio.syntax.* object TechniqueApi { sealed trait QueryFormat @@ -103,9 +103,9 @@ class TechniqueApi( configRepoPath: String ) extends LiftApiModuleProvider[API] { - import TechniqueApi._ - import zio.json._ - import zio.json.yaml._ + import TechniqueApi.* + import zio.json.* + import zio.json.yaml.* def schemas: ApiModuleProvider[API] = API val dataName = "techniques" @@ -119,7 +119,7 @@ class TechniqueApi( // implementation copied from RestUtils#actionResponse2 // but changed to never fail on reason message extraction implicit val prettify = restExtractorService.extractPrettify(req.params) - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* import net.liftweb.common.EmptyBox ( @@ -179,8 +179,8 @@ class TechniqueApi( authzToken: AuthzToken ): LiftResponse = { - import net.liftweb.json.JsonDSL._ - import zio.syntax._ + import net.liftweb.json.JsonDSL.* + import zio.syntax.* def serializeResourceWithState(resource: ResourceFile) = { (("path" -> resource.path) ~ ("state" -> resource.state.value)) @@ -234,7 +234,7 @@ class TechniqueApi( force <- restExtractorService.extractBoolean("force")(req)(identity) map (_.getOrElse(false)) _ <- techniqueWriter.deleteTechnique(techniqueInfo._1, techniqueInfo._2, force, modId, authzToken.qc.actor).toBox } yield { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* (("id" -> techniqueInfo._1) ~ ("version" -> techniqueInfo._2)) } @@ -256,7 +256,7 @@ class TechniqueApi( authzToken: AuthzToken ): LiftResponse = { val modId = ModificationId(uuidGen.newUuid) - import techniqueSerializer._ + import techniqueSerializer.* def charset: String = RestUtils.getCharset(req) // end copy @@ -325,7 +325,7 @@ class TechniqueApi( object UpdateTechniques extends LiftApiModule0 { - import techniqueSerializer._ + import techniqueSerializer.* val schema: API.UpdateTechniques.type = API.UpdateTechniques val restExtractor = restExtractorService @@ -386,7 +386,7 @@ class TechniqueApi( object CreateTechnique extends LiftApiModule0 { - import techniqueSerializer._ + import techniqueSerializer.* def moveRessources(technique: EditorTechnique, internalId: String): IO[SystemError, String] = { val workspacePath = s"workspace/${internalId}/${technique.version.value}/resources" @@ -496,20 +496,20 @@ class TechniqueApi( technique <- { input match { case QueryFormat.Yaml => - import YamlTechniqueSerializer._ + import YamlTechniqueSerializer.* content.fromYaml[EditorTechnique].toIO case QueryFormat.Json => - import techniqueSerializer._ + import techniqueSerializer.* content.fromJson[EditorTechnique].toIO } } response <- { output match { case QueryFormat.Yaml => - import YamlTechniqueSerializer._ + import YamlTechniqueSerializer.* technique.toYaml().map(yaml => Json(("output", Str(yaml)))).toIO case QueryFormat.Json => - import techniqueSerializer._ + import techniqueSerializer.* technique.toJsonAST.toIO } } @@ -848,11 +848,11 @@ class TechniqueAPIService14( } def getTechniqueJson(editorTechnique: EditorTechnique): IOResult[Json] = { - import techniqueSerializer._ - import zio.json._ + import techniqueSerializer.* + import zio.json.* import zio.json.yaml.DecoderYamlOps import TechniqueCompilationIO.codecTechniqueCompilationOutput - import com.normation.zio._ + import com.normation.zio.* val outputFile = techniqueCompiler.getCompilationOutputFile(editorTechnique) val json = (for { content <- IOResult.attempt("error when reading compilation output")(outputFile.contentAsString(StandardCharsets.UTF_8)) @@ -897,7 +897,7 @@ class TechniqueAPIService14( case Some(editorTechnique) => format match { case QueryFormat.Yaml => - import YamlTechniqueSerializer._ + import YamlTechniqueSerializer.* editorTechnique.toYaml().map(s => Json(("content", Str(s)))).toIO case QueryFormat.Json => getTechniqueJson(editorTechnique) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/v1/RestStatus.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/v1/RestStatus.scala index f4603d4d242..07522b56378 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/v1/RestStatus.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/v1/RestStatus.scala @@ -37,8 +37,8 @@ package com.normation.rudder.rest.v1 -import net.liftweb.http._ -import net.liftweb.http.rest._ +import net.liftweb.http.* +import net.liftweb.http.rest.* /** * A rest api that handle url /api/status diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala index ea5695789fb..6f748753374 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/users/User.scala @@ -50,7 +50,7 @@ import net.liftweb.http.RequestVar import org.springframework.security.core.GrantedAuthority import org.springframework.security.core.authority.SimpleGrantedAuthority import org.springframework.security.core.userdetails.UserDetails -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* /* * User related data structures related to authentication and bridging with Spring-security. diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala index edf8d421cc4..8f5c7b7ded1 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala @@ -40,17 +40,17 @@ package com.normation.rudder.web.model import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.VariableSpec import com.normation.rudder.domain.policies.DirectiveUid -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.common.Box -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.BaseField import net.liftweb.util.Helpers import org.slf4j import org.slf4j.LoggerFactory -import scala.xml._ +import scala.xml.* /** * A displayable field has 2 methods : @@ -356,7 +356,7 @@ final case class MultivaluedSectionField( private val htmlId = Helpers.nextFuncName - private def logError(box: Box[_]): Unit = box match { + private def logError(box: Box[?]): Unit = box match { case Failure(m, _, _) => logger.error(m) case Empty => logger.error("Empty value was returned") case _ => // ok @@ -429,7 +429,7 @@ final case class MultivaluedSectionField( * to the same iteration of listname. */ def mapValueSeq: Map[String, Seq[String]] = { - import scala.collection.mutable.{Buffer, Map => MutMap} + import scala.collection.mutable.{Buffer, Map as MutMap} val map = MutMap[String, Buffer[String]]() for { sect <- allSections @@ -517,7 +517,7 @@ final case class MultivaluedSectionField( // refresh UI - all item of that group SetHtml(htmlId, this.content) & postModificationJS() }, - attr: _* + attr* ) } } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala index 61e2ec22d87..0aefcb04639 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/FilePermissions.scala @@ -87,7 +87,7 @@ package com.normation.rudder.web.model * for the reader ;) */ -import Perm._ +import Perm.* import com.normation.utils.Utils.isEmpty import scala.collection.BitSet diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala index 93ac279fb22..173d15e70d9 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala @@ -47,7 +47,7 @@ import com.normation.rudder.repository.RoDirectiveRepository import com.normation.rudder.repository.RoNodeGroupRepository import com.normation.rudder.repository.RoRuleRepository import com.normation.rudder.services.nodes.NodeInfoService -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Loggable import net.liftweb.http.S import net.liftweb.http.js.JsCmd diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala index 2aff4676150..e2fe09a5265 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala @@ -37,7 +37,7 @@ package com.normation.rudder.web.services -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.repository.FullNodeGroupCategory import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.rule.category.RuleCategoryId diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DirectiveEditorService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DirectiveEditorService.scala index f6cd50f5bcf..9d44452a9a7 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DirectiveEditorService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DirectiveEditorService.scala @@ -37,7 +37,7 @@ package com.normation.rudder.web.services -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.PredefinedValuesVariableSpec import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.Variable @@ -45,7 +45,7 @@ import com.normation.cfclerk.domain.VariableSpec import com.normation.rudder.configuration.ConfigurationRepository import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.web.model.DirectiveEditor -import net.liftweb.common._ +import net.liftweb.common.* trait DirectiveEditorService { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala index 147dc3b3581..0d046d6cfa9 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala @@ -36,17 +36,17 @@ */ package com.normation.rudder.web.services -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueName import com.normation.eventlog.EventLog import com.normation.inventory.domain.NodeId -import com.normation.rudder.api._ +import com.normation.rudder.api.* import com.normation.rudder.batch.ErrorStatus import com.normation.rudder.batch.SuccessStatus -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.domain.eventlog.WorkflowStepChanged -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.properties.NodeProperty import com.normation.rudder.domain.queries.Query @@ -57,7 +57,7 @@ import com.normation.rudder.git.GitArchiveId import com.normation.rudder.git.GitCommitId import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.reports.HeartbeatConfiguration -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.rule.category.RoRuleCategoryRepository import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.services.eventlog.EventLogDetailsService @@ -67,22 +67,22 @@ import com.normation.rudder.services.nodes.NodeInfoService import com.normation.rudder.services.user.PersonIdentService import com.normation.rudder.web.model.LinkUtil import com.normation.utils.DateFormaterService -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.json.JsonAST.JObject import net.liftweb.json.JsonAST.JValue -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import org.eclipse.jgit.lib.PersonIdent import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import scala.util.{Failure => Catch} +import scala.util.Failure as Catch import scala.util.Random import scala.util.Success import scala.util.Try -import scala.xml._ +import scala.xml.* class EventLogDetailsGenerator( logDetailsService: EventLogDetailsService, @@ -102,7 +102,7 @@ class EventLogDetailsGenerator( // convention: "X" means "ignore" def displayDescription(event: EventLog): NodeSeq = { - import linkUtil._ + import linkUtil.* def crDesc(x: EventLog, actionName: NodeSeq) = { val id = RuleId.parse((x.details \ "rule" \ "id").text).getOrElse(RuleId(RuleUid(""))) val name = (x.details \ "rule" \ "displayName").text diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/JsTableData.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/JsTableData.scala index b037cbd8062..3a7e295164f 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/JsTableData.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/JsTableData.scala @@ -53,7 +53,7 @@ trait JsTableLine extends Loggable { // this is needed because DataTable doesn't escape HTML element when using table.rows.add def escapeHTML(s: String): JsExp = JsExp.strToJsExp(xml.Utility.escape(s)) - import com.normation.rudder.domain.reports.ComplianceLevelSerialisation._ + import com.normation.rudder.domain.reports.ComplianceLevelSerialisation.* def jsCompliance(compliance: ComplianceLevel) = compliance.toJsArray } diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala index c5f5ea6518b..4e1f489451b 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Section2FieldService.scala @@ -37,11 +37,11 @@ package com.normation.rudder.web.services -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.rudder.domain.policies.DirectiveUid -import com.normation.rudder.web.model._ +import com.normation.rudder.web.model.* import com.normation.utils.Control.traverse -import net.liftweb.common._ +import net.liftweb.common.* /** * Create web representation of Directive in the goal @@ -307,7 +307,7 @@ class Section2FieldService(val fieldFactory: DirectiveFieldFactory, val translat private def createDefaultMap(section: SectionSpec): Map[String, Option[String]] = section.getVariables.map(varSpec => (varSpec.name, varSpec.constraint.default)).toMap - private def setValueForField(value: String, currentField: DirectiveField, unserializer: Unserializer[_]): Unit = { + private def setValueForField(value: String, currentField: DirectiveField, unserializer: Unserializer[?]): Unit = { // if the var is not a GUI only var, just find the field unserializer and use it unserializer.get("self") match { case Some(unser) => diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Translator.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Translator.scala index 94fbc14cda5..2809646b80b 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Translator.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/Translator.scala @@ -39,11 +39,11 @@ package com.normation.rudder.web.services import com.normation.utils.Utils.isEmpty import java.util.Locale -import net.liftweb.common._ +import net.liftweb.common.* import org.apache.commons.io.FilenameUtils import org.joda.time.format.DateTimeFormat import org.joda.time.format.DateTimeFormatter -import scala.collection.mutable.{Map => MutMap} +import scala.collection.mutable.Map as MutMap class Serializer[T](techniques: (String, T => String)*) { // all the known properties for that type @@ -107,7 +107,7 @@ class Translator[T](val to: Serializer[T], val from: Unserializer[T]) class Translators { - private val reg: MutMap[Manifest[_], Translator[_]] = MutMap() + private val reg: MutMap[Manifest[?], Translator[?]] = MutMap() /** * Add a translator for the given type. diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/UserPropertyService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/UserPropertyService.scala index 5c0278610ab..fcc164b9b92 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/UserPropertyService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/UserPropertyService.scala @@ -35,9 +35,9 @@ ************************************************************************************* */ package com.normation.rudder.web.services -import com.normation.box._ -import com.normation.errors._ -import zio.syntax._ +import com.normation.box.* +import com.normation.errors.* +import zio.syntax.* object ReasonBehavior extends Enumeration { type ReasonBehavior = Value diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala index 380d82d6441..7f6a9b1d93a 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala @@ -124,10 +124,10 @@ import net.liftweb.common.Full import org.joda.time.DateTime import scala.collection.MapView import scala.collection.immutable.SortedMap -import zio._ -import zio.{System => _} -import zio.{Tag => _} -import zio.syntax._ +import zio.* +import zio.System as _ +import zio.Tag as _ +import zio.syntax.* /* * Mock services for test, especially repositories, and provides @@ -353,8 +353,8 @@ class MockCompliance(mockDirectives: MockDirectives) { } val complianceAPIService: ComplianceAPIService = { - import simpleExample._ - import complexExample._ + import simpleExample.* + import complexExample.* buildComplianceService( simpleCustomRules ++ complexCustomRules, simpleCustomNodeGroups ++ complexCustomNodeGroups, diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/ArchiveApiTest.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/ArchiveApiTest.scala index c65a74be734..2b883e16270 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/ArchiveApiTest.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/ArchiveApiTest.scala @@ -67,7 +67,7 @@ import com.normation.rudder.rest.lift.TechniqueArchive import com.normation.rudder.rest.lift.TechniqueInfo import com.normation.rudder.rest.lift.TechniqueType import com.normation.utils.DateFormaterService -import com.normation.zio._ +import com.normation.zio.* import java.io.FileOutputStream import java.util.zip.ZipFile import net.liftweb.common.Full @@ -709,8 +709,8 @@ class ArchiveApiTest extends Specification with AfterAll with Loggable { * anymore. */ "correctly build an archive with past revision items" >> { - import zio.json._ - import com.normation.rudder.apidata.implicits._ + import zio.json.* + import com.normation.rudder.apidata.implicits.* val initRev = { val head = restTestSetUp.mockGitRepo.gitRepo.db.exactRef("refs/heads/master") diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/CampaignApiTest.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/CampaignApiTest.scala index 832a1bac729..5481bfc6f28 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/CampaignApiTest.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/CampaignApiTest.scala @@ -44,7 +44,7 @@ import com.normation.rudder.campaigns.Scheduled import com.normation.rudder.rest.RudderJsonResponse.JsonRudderApiResponse import com.normation.rudder.rest.RudderJsonResponse.LiftJsonResponse import com.normation.utils.DateFormaterService -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Full import net.liftweb.common.Loggable import org.apache.commons.io.FileUtils @@ -54,7 +54,7 @@ import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner import org.specs2.specification.AfterAll import scala.annotation.nowarn -import zio.json._ +import zio.json.* @nowarn("msg=a type was inferred to be `\\w+`; this may indicate a programming error.") @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/NodeApiTest.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/NodeApiTest.scala index 263125276e1..7f675b9f896 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/NodeApiTest.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/NodeApiTest.scala @@ -3,7 +3,7 @@ package com.normation.rudder.rest import com.normation.inventory.domain.AcceptedInventory import com.normation.inventory.domain.NodeId import com.normation.inventory.domain.PendingInventory -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Full import net.liftweb.common.Loggable import net.liftweb.json.JsonParser diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala index 51846baf46c..2fef1487f5d 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestDataExtractorTest.scala @@ -42,17 +42,17 @@ import com.normation.rudder.MockDirectives import com.normation.rudder.MockGitConfigRepo import com.normation.rudder.MockRules import com.normation.rudder.MockTechniques -import com.normation.rudder.apidata.JsonQueryObjects._ -import com.normation.rudder.apidata.JsonResponseObjects._ -import com.normation.rudder.apidata.JsonResponseObjects.JRRuleTarget._ -import com.normation.rudder.apidata.implicits._ +import com.normation.rudder.apidata.JsonQueryObjects.* +import com.normation.rudder.apidata.JsonResponseObjects.* +import com.normation.rudder.apidata.JsonResponseObjects.JRRuleTarget.* +import com.normation.rudder.apidata.implicits.* import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.nodes.NodeGroupUid -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.utils.StringUuidGeneratorImpl import net.liftweb.json.JValue import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import org.specs2.specification.core.Fragments diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala index ac0bc47172d..7fa3b4c36d8 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala @@ -37,7 +37,7 @@ package com.normation.rudder.rest -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueName import com.normation.cfclerk.domain.VariableSpec import com.normation.cfclerk.services.TechniqueRepository @@ -51,12 +51,12 @@ import com.normation.eventlog.EventLogFilter import com.normation.eventlog.ModificationId import com.normation.inventory.domain.FullInventory import com.normation.inventory.domain.NodeId -import com.normation.rudder._ -import com.normation.rudder.api.{ApiAuthorization => ApiAuthz} +import com.normation.rudder.* +import com.normation.rudder.api.ApiAuthorization as ApiAuthz import com.normation.rudder.api.ApiVersion import com.normation.rudder.apidata.RestDataSerializerImpl import com.normation.rudder.apidata.ZioJsonExtractor -import com.normation.rudder.batch._ +import com.normation.rudder.batch.* import com.normation.rudder.batch.PolicyGenerationTrigger.AllGeneration import com.normation.rudder.campaigns.CampaignSerializer import com.normation.rudder.domain.appconfig.FeatureSwitch @@ -99,13 +99,13 @@ import com.normation.rudder.reports.GlobalComplianceMode import com.normation.rudder.reports.execution.AgentRunWithNodeConfig import com.normation.rudder.reports.execution.AgentRunWithoutCompliance import com.normation.rudder.reports.execution.RoReportsExecutionRepository -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.rest.data.Creation import com.normation.rudder.rest.data.Creation.CreationError import com.normation.rudder.rest.data.NodeSetup import com.normation.rudder.rest.internal.RuleInternalApiService import com.normation.rudder.rest.internal.RulesInternalApi -import com.normation.rudder.rest.lift._ +import com.normation.rudder.rest.lift.* import com.normation.rudder.rest.v1.RestStatus import com.normation.rudder.rule.category.RuleCategoryService import com.normation.rudder.services.ClearCacheService @@ -138,7 +138,7 @@ import com.normation.rudder.services.workflows.CommitAndDeployChangeRequestServi import com.normation.rudder.services.workflows.CommitAndDeployChangeRequestServiceImpl import com.normation.rudder.services.workflows.DefaultWorkflowLevel import com.normation.rudder.services.workflows.NoWorkflowServiceImpl -import com.normation.rudder.users._ +import com.normation.rudder.users.* import com.normation.rudder.web.model.DirectiveField import com.normation.rudder.web.services.DirectiveEditorServiceImpl import com.normation.rudder.web.services.DirectiveFieldFactory @@ -146,8 +146,8 @@ import com.normation.rudder.web.services.Section2FieldService import com.normation.rudder.web.services.StatelessUserPropertyService import com.normation.rudder.web.services.Translator import com.normation.utils.StringUuidGeneratorImpl -import com.normation.zio._ -import doobie._ +import com.normation.zio.* +import doobie.* import java.nio.charset.StandardCharsets import net.liftweb.common.Box import net.liftweb.common.EmptyBox @@ -177,8 +177,8 @@ import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration import scala.xml.Elem import scala.xml.NodeSeq -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * This file provides all the necessary plumbing to allow test REST API. @@ -898,11 +898,11 @@ class RestTestSetUp { val translator = new CampaignSerializer() translator.addJsonTranslater(mockCampaign.dumbCampaignTranslator) - import mockCampaign._ + import mockCampaign.* val api = new CampaignApi(repo, translator, dumbCampaignEventRepository, mainCampaignService, restExtractorService, uuidGen) } - val apiModules: List[LiftApiModuleProvider[_ <: EndpointSchema with SortIndex]] = List( + val apiModules: List[LiftApiModuleProvider[? <: EndpointSchema with SortIndex]] = List( systemApi, new ParameterApi(restExtractorService, zioJsonExtractor, parameterApiService2, parameterApiService14), new TechniqueApi( diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SharedFilesApiTest.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SharedFilesApiTest.scala index 2b606de1a04..49402742dd7 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SharedFilesApiTest.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SharedFilesApiTest.scala @@ -37,14 +37,14 @@ package com.normation.rudder.rest -import better.files._ -import com.normation.rudder.rest.internal.SharedFilesAPI._ +import better.files.* +import com.normation.rudder.rest.internal.SharedFilesAPI.* import com.normation.zio.ZioRuntime import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class SharedFilesApiTest extends Specification { diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SystemApiTest.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SystemApiTest.scala index 3c63a8fd033..2fc333ad8be 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SystemApiTest.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/SystemApiTest.scala @@ -42,12 +42,12 @@ import com.normation.rudder.rest.v1.RestStatus import java.io.File import java.nio.file.Files import java.util.zip.ZipFile -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.InMemoryResponse import net.liftweb.http.PlainTextResponse import net.liftweb.http.Req -import net.liftweb.json.JsonAST._ -import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonAST.* +import net.liftweb.json.JsonDSL.* import org.apache.commons.io.FileUtils import org.junit.runner.RunWith import org.specs2.mutable.Specification @@ -526,7 +526,7 @@ class SystemApiTest extends Specification with AfterAll with Loggable { .haveSameFilesAs(restTestSetUp.mockGitRepo.configurationRepositoryRoot.toJava) .withFilter(filterGeneratedFile _) case Full(JsonResponsePrettify(json, _, _, code, _)) => - import net.liftweb.http.js.JsExp._ + import net.liftweb.http.js.JsExp.* (code must beEqualTo(500)) and (json.toJsCmd must beMatching( ".*Error when trying to get archive as a Zip: SystemError: Error when retrieving commit revision.*" diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestDirectiveComplianceCsv.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestDirectiveComplianceCsv.scala index 6447b85cbfd..be20fb3895c 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestDirectiveComplianceCsv.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestDirectiveComplianceCsv.scala @@ -55,7 +55,7 @@ import com.normation.rudder.rest.data.ByRuleNodeCompliance import com.normation.rudder.rest.data.ByRuleValueCompliance import com.normation.rudder.rest.data.CsvCompliance import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala index c241024d64d..61179d1bd85 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala @@ -37,10 +37,10 @@ package com.normation.rudder.rest -import better.files._ +import better.files.* import com.normation.cfclerk.domain.TechniqueName import com.normation.utils.ParseVersion -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.http.LiftRules import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestPlusInPath.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestPlusInPath.scala index ee458d7cb13..2086817ca65 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestPlusInPath.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestPlusInPath.scala @@ -45,12 +45,12 @@ import com.normation.rudder.domain.policies.RuleUid import com.normation.rudder.facts.nodes.ChangeContext import com.normation.rudder.facts.nodes.NodeFact import com.normation.rudder.facts.nodes.QueryContext -import com.normation.zio._ +import com.normation.zio.* import net.liftweb.common.Full import net.liftweb.http.InMemoryResponse import net.liftweb.mocks.MockHttpServletRequest import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import org.specs2.specification.BeforeAfterAll @@ -66,7 +66,7 @@ class TestRestPlusInPath extends Specification with BeforeAfterAll { .asInstanceOf[ch.qos.logback.classic.Logger] .setLevel(ch.qos.logback.classic.Level.OFF) val env = RestTestSetUp.newEnv - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* val rule: Rule = env.mockRules.ruleRepo .get(RuleId(RuleUid("ff44fb97-b65e-43c4-b8c2-0df8d5e8549f"))) .runNow diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala index e827688e103..b6d8ff97381 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TraitTestApiFromYamlFiles.scala @@ -37,11 +37,11 @@ package com.normation.rudder.rest -import better.files._ +import better.files.* import com.normation.BoxSpecMatcher import com.normation.JsonSpecMatcher import com.normation.box.IOManaged -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.errors.effectUioUnit import com.normation.rudder.AuthorizationType @@ -52,8 +52,8 @@ import com.normation.rudder.facts.nodes.NodeSecurityContext import com.normation.rudder.rest.lift.LiftApiModuleProvider import com.normation.rudder.rest.lift.LiftApiProcessingLogger import com.normation.rudder.rest.lift.LiftHandler -import com.normation.rudder.users._ -import com.normation.zio._ +import com.normation.rudder.users.* +import com.normation.zio.* import java.io.InputStream import java.nio.charset.StandardCharsets import java.nio.file.Path @@ -68,14 +68,14 @@ import net.liftweb.http.LiftRules import net.liftweb.mocks.MockHttpServletRequest import net.liftweb.util.Helpers.tryo import org.specs2.matcher.Matcher -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.specification.core.Fragment import org.specs2.specification.core.Fragments import org.yaml.snakeyaml.Yaml -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import scala.util.control.NonFatal -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * Utily data structures @@ -101,7 +101,7 @@ final case class TestRequest( object TraitTestApiFromYamlFiles { - def buildLiftRules[A <: LiftApiModuleProvider[_ <: EndpointSchema]]( + def buildLiftRules[A <: LiftApiModuleProvider[? <: EndpointSchema]]( modules: List[A], versions: List[ApiVersion], userService: Option[UserService] @@ -248,8 +248,8 @@ trait TraitTestApiFromYamlFiles extends Specification with BoxSpecMatcher with J * a Map[String, Object]. Which not much better. Expects other cast along the line. */ def readSpecification(obj: Object): Box[TestRequest] = { - import java.util.{Map => JUMap} - import java.util.{ArrayList => JUList} + import java.util.Map as JUMap + import java.util.ArrayList as JUList type YMap = JUMap[String, Any] // transform parameter "Any" to a scala List[(String, String)] where key can be repeated. @@ -257,7 +257,7 @@ trait TraitTestApiFromYamlFiles extends Specification with BoxSpecMatcher with J def paramsToScala(t: Any): List[(String, String)] = { t.asInstanceOf[JUMap[String, Any]].asScala.toList.flatMap { case (k, v: String) => List((k, v)) - case (k, v: JUList[_]) => v.asScala.map(x => (k, x.toString)).toList + case (k, v: JUList[?]) => v.asScala.map(x => (k, x.toString)).toList case (k, x) => throw new IllegalArgumentException(s"Can not parse '${x}:${x.getClass.getName}' as either a string or a list of string") } diff --git a/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala b/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala index 8ba67ee40e6..c951a584ff5 100644 --- a/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala +++ b/webapp/sources/rudder/rudder-templates-cli/src/main/scala/com/normation/templates/cli/TemplateCli.scala @@ -37,22 +37,22 @@ package com.normation.templates.cli -import com.normation.errors._ +import com.normation.errors.* import com.normation.templates.FillTemplatesService import com.normation.templates.FillTemplateTimer import com.normation.templates.STVariable -import com.normation.zio._ +import com.normation.zio.* import java.io.File import java.nio.charset.StandardCharsets -import net.liftweb.common._ +import net.liftweb.common.* import org.apache.commons.io.FileUtils import org.apache.commons.io.IOUtils import scala.collection.immutable.ArraySeq import scopt.OptionParser -import zio.{System => _, _} -import zio.json._ +import zio.{System as _, *} +import zio.json.* import zio.json.ast.Json -import zio.syntax._ +import zio.syntax.* /** * The configuration object for our CLI. diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/JsonVariablesTest.scala b/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/JsonVariablesTest.scala index 8b570b465e0..7d13ea461aa 100644 --- a/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/JsonVariablesTest.scala +++ b/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/JsonVariablesTest.scala @@ -38,7 +38,7 @@ package com.normation.templates.cli import com.normation.templates.STVariable -import com.normation.zio._ +import com.normation.zio.* import org.junit.runner.RunWith import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/TemplateCliTest.scala b/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/TemplateCliTest.scala index c54ca9592d7..5ad9c7a5198 100644 --- a/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/TemplateCliTest.scala +++ b/webapp/sources/rudder/rudder-templates-cli/src/test/scala/com/normation/templates/cli/TemplateCliTest.scala @@ -37,7 +37,7 @@ package com.normation.templates.cli -import com.normation.zio._ +import com.normation.zio.* import java.io.File import java.io.FileInputStream import java.io.PrintStream diff --git a/webapp/sources/rudder/rudder-templates/src/main/scala/com/normation/templates/FillTemplatesService.scala b/webapp/sources/rudder/rudder-templates/src/main/scala/com/normation/templates/FillTemplatesService.scala index c7d506b02c2..a6f99ce05f9 100644 --- a/webapp/sources/rudder/rudder-templates/src/main/scala/com/normation/templates/FillTemplatesService.scala +++ b/webapp/sources/rudder/rudder-templates/src/main/scala/com/normation/templates/FillTemplatesService.scala @@ -43,15 +43,15 @@ package com.normation.templates */ import com.normation.NamedZioLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.stringtemplate.language.NormationAmpersandTemplateLexer -import com.normation.zio._ +import com.normation.zio.* import com.normation.zio.ZioRuntime import org.antlr.stringtemplate.StringTemplate import org.apache.commons.lang3.StringUtils import scala.collection.immutable.ArraySeq -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * A "string template variable" is a variable destinated to be diff --git a/webapp/sources/rudder/rudder-templates/src/test/scala/com/normation/templates/TemplateTest.scala b/webapp/sources/rudder/rudder-templates/src/test/scala/com/normation/templates/TemplateTest.scala index f0a73074658..77c6f7e62fe 100644 --- a/webapp/sources/rudder/rudder-templates/src/test/scala/com/normation/templates/TemplateTest.scala +++ b/webapp/sources/rudder/rudder-templates/src/test/scala/com/normation/templates/TemplateTest.scala @@ -37,9 +37,9 @@ package com.normation.templates -import com.normation.stringtemplate.language._ -import org.antlr.stringtemplate._ -import org.junit.Assert._ +import com.normation.stringtemplate.language.* +import org.antlr.stringtemplate.* +import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala index c27984ee08f..c4afe15ee5b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala @@ -37,16 +37,17 @@ package bootstrap.liftweb -import com.normation.errors._ +import com.normation.errors.* import com.normation.rudder.Role -import com.normation.rudder.api._ +import com.normation.rudder.api.* import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.facts.nodes.NodeSecurityContext -import com.normation.rudder.users._ +import com.normation.rudder.facts.nodes.QueryContext +import com.normation.rudder.users.* import com.normation.rudder.users.RudderUserDetail import com.normation.rudder.web.services.UserSessionLogEvent -import com.normation.zio._ -import com.softwaremill.quicklens._ +import com.normation.zio.* +import com.softwaremill.quicklens.* import com.typesafe.config.Config import com.typesafe.config.ConfigException import java.util.Collection @@ -57,7 +58,7 @@ import javax.servlet.ServletRequest import javax.servlet.ServletResponse import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer import org.springframework.context.ApplicationContext @@ -86,7 +87,7 @@ import org.springframework.security.web.authentication.AuthenticationFailureHand import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler import scala.annotation.nowarn import scala.util.Try -import zio.syntax._ +import zio.syntax.* /** * Spring configuration for user authentication. @@ -142,7 +143,7 @@ class AppConfigAuth extends ApplicationContextAware { // prepare specific properties for each configuredAuthProviders - we need system properties for spring - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* val providerProperties: Map[String, AuthBackendProviderProperties] = configuredAuthProviders.flatMap { x => try { // try to load all the specific properties of that auth type @@ -202,7 +203,7 @@ class AppConfigAuth extends ApplicationContextAware { val ctx = new ClassPathXmlApplicationContext(applicationContext) ctx.addBeanFactoryPostProcessor(propertyConfigurer) // here, we load all spring bean conigured in the classpath files: applicationContext-security-auth-BACKEND.xml - ctx.setConfigLocations(configuredAuthProviders.map(_.configFile).toSeq: _*) + ctx.setConfigLocations(configuredAuthProviders.map(_.configFile).toSeq*) ctx.refresh // now, handle back the configured bean / user configured list to AuthBackendProvidersManager @@ -445,7 +446,7 @@ class RudderXmlUserDetailsContextMapper(authConfigProvider: UserDetailListProvid def mapUserFromContext( ctx: DirContextOperations, username: String, - authorities: Collection[_ <: GrantedAuthority] + authorities: Collection[? <: GrantedAuthority] ): UserDetails = { authConfigProvider.authConfig.users .getOrElse( @@ -866,7 +867,7 @@ case class RudderAuthenticationProvider(name: String, provider: AuthenticationPr provider.authenticate(authentication) } - override def supports(authentication: Class[_]): Boolean = { + override def supports(authentication: Class[?]): Boolean = { provider.supports(authentication) } } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala index f724012fbd4..21c06c6d701 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala @@ -55,9 +55,9 @@ import com.normation.rudder.domain.eventlog.LogoutEventLog import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.domain.logger.ApplicationLoggerPure import com.normation.rudder.domain.logger.PluginLogger -import com.normation.rudder.rest.{InfoApi => InfoApiDef} import com.normation.rudder.rest.ApiModuleProvider import com.normation.rudder.rest.EndpointSchema +import com.normation.rudder.rest.InfoApi as InfoApiDef import com.normation.rudder.rest.lift.InfoApi import com.normation.rudder.rest.lift.LiftApiModuleProvider import com.normation.rudder.rest.v1.RestStatus @@ -66,20 +66,20 @@ import com.normation.rudder.users.RudderUserDetail import com.normation.rudder.web.snippet.CustomPageJs import com.normation.rudder.web.snippet.WithCachedResource import com.normation.rudder.web.snippet.WithNonce -import com.normation.zio._ +import com.normation.zio.* import java.net.URI import java.net.URLConnection import java.util.Locale -import net.liftweb.common._ -import net.liftweb.http._ +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.js.JE.JsRaw import net.liftweb.http.rest.RestHelper -import net.liftweb.sitemap._ -import net.liftweb.sitemap.Loc._ +import net.liftweb.sitemap.* +import net.liftweb.sitemap.Loc.* import net.liftweb.sitemap.Loc.LocGroup import net.liftweb.sitemap.Loc.TestAccess import net.liftweb.sitemap.Menu -import net.liftweb.util.TimeHelpers._ +import net.liftweb.util.TimeHelpers.* import net.liftweb.util.Vendor import org.joda.time.DateTime import org.reflections.Reflections @@ -87,7 +87,7 @@ import org.springframework.security.core.Authentication import org.springframework.security.core.context.SecurityContextHolder import scala.concurrent.duration.DAYS import scala.concurrent.duration.Duration -import scala.util.chaining._ +import scala.util.chaining.* import scala.util.matching.Regex import scala.xml.Elem import scala.xml.Node @@ -119,7 +119,7 @@ object Boot { * We use it as default vendor for headers with our custom routing logic of CSP headers for instance. */ final class RequestHeadersFactoryVendor(csp: ContentSecurityPolicy) extends Vendor[List[(String, String)]] { - import RequestHeadersFactoryVendor._ + import RequestHeadersFactoryVendor.* LiftRules.registerInjection(this) @@ -239,7 +239,7 @@ object PluginsInfo { case None => recApi(apis, tail) case Some(x) => x.schemas match { - case p: ApiModuleProvider[_] => recApi(p.endpoints ::: apis, tail) + case p: ApiModuleProvider[?] => recApi(p.endpoints ::: apis, tail) case _ => recApi(apis, tail) } } @@ -426,7 +426,7 @@ object FindCurrentUser { */ class Boot extends Loggable { - import Boot._ + import Boot.* def boot(): Unit = { @@ -899,7 +899,7 @@ class Boot extends Loggable { // not sur why we are using that ? // SiteMap.enforceUniqueLinks = false - LiftRules.setSiteMapFunc(() => SiteMap(newSiteMap: _*)) + LiftRules.setSiteMapFunc(() => SiteMap(newSiteMap*)) // load users from rudder-users.xml RudderConfig.rudderUserListProvider.reload() @@ -954,7 +954,7 @@ class Boot extends Loggable { } private[this] def initPlugins(): List[RudderPluginDef] = { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* val reflections = new Reflections("bootstrap.rudder.plugin", "com.normation.plugins") @@ -1008,7 +1008,7 @@ class Boot extends Loggable { plugin.init // add APIs - plugin.apis.foreach { (api: LiftApiModuleProvider[_]) => + plugin.apis.foreach { (api: LiftApiModuleProvider[?]) => RudderConfig.rudderApi.addModules(api.getLiftEndpoints()) RudderConfig.authorizationApiMapping.addMapper(api.schemas.authorizationApiMapping) } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/BootstrapChecks.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/BootstrapChecks.scala index f70d901808e..591ae62c6c8 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/BootstrapChecks.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/BootstrapChecks.scala @@ -70,7 +70,7 @@ object BootstrapLogger extends NamedZioLogger { class SequentialImmediateBootStrapChecks(_checkActions: BootstrapChecks*) extends BootstrapChecks { - private[this] val checkActions = collection.mutable.Buffer[BootstrapChecks](_checkActions: _*) + private[this] val checkActions = collection.mutable.Buffer[BootstrapChecks](_checkActions*) def appendBootstrapChecks(check: BootstrapChecks): Unit = { checkActions.append(check) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/LiftInitContextListener.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/LiftInitContextListener.scala index 61ebb8aed5a..55d0328b6e3 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/LiftInitContextListener.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/LiftInitContextListener.scala @@ -40,14 +40,14 @@ package bootstrap.liftweb import bootstrap.liftweb.RudderProperties.config import com.normation.errors.SystemError import com.normation.rudder.domain.logger.ApplicationLogger -import com.normation.zio._ +import com.normation.zio.* import com.typesafe.config.ConfigException import java.io.File import java.net.URL import javax.servlet.ServletContextEvent -import net.liftweb.common._ -import org.springframework.core.io.{ClassPathResource => CPResource} -import org.springframework.core.io.{FileSystemResource => FSResource} +import net.liftweb.common.* +import org.springframework.core.io.ClassPathResource as CPResource +import org.springframework.core.io.FileSystemResource as FSResource import org.springframework.web.context.ContextLoaderListener import org.springframework.web.context.support.WebApplicationContextUtils diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala index 7c4d9d8975f..9aa6fa98e34 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala @@ -58,38 +58,38 @@ import bootstrap.liftweb.checks.migration.MigrateJsonTechniquesToYaml import bootstrap.liftweb.checks.migration.MigrateNodeAcceptationInventories import bootstrap.liftweb.checks.onetimeinit.CheckInitUserTemplateLibrary import bootstrap.liftweb.checks.onetimeinit.CheckInitXmlExport -import com.normation.appconfig._ -import com.normation.box._ -import com.normation.cfclerk.services._ -import com.normation.cfclerk.services.impl._ -import com.normation.cfclerk.xmlparsers._ +import com.normation.appconfig.* +import com.normation.box.* +import com.normation.cfclerk.services.* +import com.normation.cfclerk.services.impl.* +import com.normation.cfclerk.xmlparsers.* import com.normation.cfclerk.xmlwriters.SectionSpecWriter import com.normation.cfclerk.xmlwriters.SectionSpecWriterImpl -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.errors.SystemError -import com.normation.inventory.domain._ -import com.normation.inventory.ldap.core._ +import com.normation.inventory.domain.* +import com.normation.inventory.ldap.core.* import com.normation.inventory.ldap.provisioning.AddIpValues import com.normation.inventory.ldap.provisioning.CheckOsType import com.normation.inventory.ldap.provisioning.LastInventoryDate import com.normation.inventory.ldap.provisioning.NameAndVersionIdFinder import com.normation.inventory.provisioning.fusion.FusionInventoryParser import com.normation.inventory.provisioning.fusion.PreInventoryParserCheckConsistency -import com.normation.inventory.services.core._ +import com.normation.inventory.services.core.* import com.normation.inventory.services.provisioning.DefaultInventoryParser import com.normation.inventory.services.provisioning.InventoryDigestServiceV1 import com.normation.inventory.services.provisioning.InventoryParser -import com.normation.ldap.sdk._ +import com.normation.ldap.sdk.* import com.normation.plugins.FilePluginSettingsService import com.normation.plugins.ReadPluginPackageInfo import com.normation.plugins.SnippetExtensionRegister import com.normation.plugins.SnippetExtensionRegisterImpl -import com.normation.rudder.api._ +import com.normation.rudder.api.* import com.normation.rudder.apidata.RestDataSerializer import com.normation.rudder.apidata.RestDataSerializerImpl import com.normation.rudder.apidata.ZioJsonExtractor -import com.normation.rudder.batch._ +import com.normation.rudder.batch.* import com.normation.rudder.campaigns.CampaignEventRepositoryImpl import com.normation.rudder.campaigns.CampaignRepositoryImpl import com.normation.rudder.campaigns.CampaignSerializer @@ -100,12 +100,12 @@ import com.normation.rudder.configuration.ConfigurationRepositoryImpl import com.normation.rudder.configuration.GroupRevisionRepository import com.normation.rudder.configuration.RuleRevisionRepository import com.normation.rudder.db.Doobie -import com.normation.rudder.domain._ +import com.normation.rudder.domain.* import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.domain.logger.NodeConfigurationLoggerImpl import com.normation.rudder.domain.logger.ScheduledJobLoggerPure import com.normation.rudder.domain.nodes.NodeGroupId -import com.normation.rudder.domain.queries._ +import com.normation.rudder.domain.queries.* import com.normation.rudder.facts.nodes.AppLogNodeFactChangeEventCallback import com.normation.rudder.facts.nodes.CacheInvalidateNodeFactEventCallback import com.normation.rudder.facts.nodes.CoreNodeFactRepository @@ -133,7 +133,7 @@ import com.normation.rudder.inventory.InventoryProcessor import com.normation.rudder.inventory.PostCommitInventoryHooks import com.normation.rudder.inventory.ProcessFile import com.normation.rudder.inventory.TriggerInventoryScorePostCommit -import com.normation.rudder.metrics._ +import com.normation.rudder.metrics.* import com.normation.rudder.migration.DefaultXmlEventLogMigration import com.normation.rudder.ncf import com.normation.rudder.ncf.DeleteEditorTechniqueImpl @@ -150,18 +150,18 @@ import com.normation.rudder.ncf.TechniqueWriter import com.normation.rudder.ncf.TechniqueWriterImpl import com.normation.rudder.ncf.WebappTechniqueCompiler import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer -import com.normation.rudder.reports._ -import com.normation.rudder.reports.execution._ -import com.normation.rudder.repository._ -import com.normation.rudder.repository.jdbc._ -import com.normation.rudder.repository.ldap._ -import com.normation.rudder.repository.xml._ +import com.normation.rudder.reports.* +import com.normation.rudder.reports.execution.* +import com.normation.rudder.repository.* +import com.normation.rudder.repository.jdbc.* +import com.normation.rudder.repository.ldap.* +import com.normation.rudder.repository.xml.* import com.normation.rudder.repository.xml.GitParseTechniqueLibrary -import com.normation.rudder.rest._ -import com.normation.rudder.rest.internal._ +import com.normation.rudder.rest.* +import com.normation.rudder.rest.internal.* import com.normation.rudder.rest.lift -import com.normation.rudder.rest.lift._ -import com.normation.rudder.rule.category._ +import com.normation.rudder.rest.lift.* +import com.normation.rudder.rule.category.* import com.normation.rudder.rule.category.GitRuleCategoryArchiverImpl import com.normation.rudder.score.GlobalScoreRepositoryImpl import com.normation.rudder.score.ScoreRepositoryImpl @@ -169,38 +169,38 @@ import com.normation.rudder.score.ScoreService import com.normation.rudder.score.ScoreServiceImpl import com.normation.rudder.score.ScoreServiceManager import com.normation.rudder.score.SystemUpdateScoreHandler -import com.normation.rudder.services._ -import com.normation.rudder.services.eventlog._ +import com.normation.rudder.services.* +import com.normation.rudder.services.eventlog.* import com.normation.rudder.services.eventlog.EventLogFactoryImpl -import com.normation.rudder.services.healthcheck._ -import com.normation.rudder.services.marshalling._ +import com.normation.rudder.services.healthcheck.* +import com.normation.rudder.services.marshalling.* import com.normation.rudder.services.modification.DiffService import com.normation.rudder.services.modification.DiffServiceImpl import com.normation.rudder.services.modification.ModificationService -import com.normation.rudder.services.nodes._ +import com.normation.rudder.services.nodes.* import com.normation.rudder.services.nodes.history.impl.FullInventoryFileParser import com.normation.rudder.services.nodes.history.impl.InventoryHistoryJdbcRepository import com.normation.rudder.services.nodes.history.impl.InventoryHistoryLogRepository -import com.normation.rudder.services.policies._ -import com.normation.rudder.services.policies.nodeconfig._ -import com.normation.rudder.services.policies.write._ -import com.normation.rudder.services.queries._ +import com.normation.rudder.services.policies.* +import com.normation.rudder.services.policies.nodeconfig.* +import com.normation.rudder.services.policies.write.* +import com.normation.rudder.services.queries.* import com.normation.rudder.services.quicksearch.FullQuickSearchService -import com.normation.rudder.services.reports._ -import com.normation.rudder.services.servers._ -import com.normation.rudder.services.system._ -import com.normation.rudder.services.user._ -import com.normation.rudder.services.workflows._ +import com.normation.rudder.services.reports.* +import com.normation.rudder.services.servers.* +import com.normation.rudder.services.system.* +import com.normation.rudder.services.user.* +import com.normation.rudder.services.workflows.* import com.normation.rudder.tenants.DefaultTenantService import com.normation.rudder.tenants.TenantService -import com.normation.rudder.users._ -import com.normation.rudder.web.model._ -import com.normation.rudder.web.services._ +import com.normation.rudder.users.* +import com.normation.rudder.web.model.* +import com.normation.rudder.web.services.* import com.normation.templates.FillTemplatesService -import com.normation.utils.CronParser._ +import com.normation.utils.CronParser.* import com.normation.utils.StringUuidGenerator import com.normation.utils.StringUuidGeneratorImpl -import com.normation.zio._ +import com.normation.zio.* import com.typesafe.config.Config import com.typesafe.config.ConfigException import com.typesafe.config.ConfigFactory @@ -211,7 +211,7 @@ import java.io.File import java.nio.file.attribute.PosixFilePermission import java.security.Security import java.util.concurrent.TimeUnit -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.common.Loggable import org.apache.commons.io.FileUtils import org.bouncycastle.jce.provider.BouncyCastleProvider @@ -220,8 +220,8 @@ import scala.collection.mutable.Buffer import scala.concurrent.duration import scala.concurrent.duration.FiniteDuration import scala.util.Try -import zio.{Scheduler => _, System => _, _} -import zio.syntax._ +import zio.{Scheduler as _, System as _, *} +import zio.syntax.* object RUDDER_CHARSET { import java.nio.charset.StandardCharsets @@ -365,7 +365,7 @@ object RudderProperties { overrideDir.foreach { d => val dest = better.files.File(d) / "rudder-web.properties-resolved-debug" ApplicationLogger.debug(s"Writing resolved configuration file to ${dest.pathAsString}") - import java.nio.file.attribute.PosixFilePermission._ + import java.nio.file.attribute.PosixFilePermission.* try { dest.writeText(config.root().render()).setPermissions(Set(OWNER_READ)) } catch { @@ -389,7 +389,7 @@ object RudderProperties { } object RudderParsedProperties { - import RudderConfigInit._ + import RudderConfigInit.* import RudderProperties.config val logger = ApplicationLogger.Properties @@ -409,7 +409,7 @@ object RudderParsedProperties { val filteredPasswords: Buffer[String] = scala.collection.mutable.Buffer[String]() def logRudderParsedProperties(): Unit = { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* val config = RudderProperties.config if (ApplicationLogger.isInfoEnabled) { // sort properties by key name @@ -440,7 +440,7 @@ object RudderParsedProperties { // auth backend is init too late to have a chance to hide its values, which is a bit sad. // We still need to make invisible all oauth/oidc client secret hiddenRegisteredProperties ++= { - import scala.jdk.CollectionConverters._ + import scala.jdk.CollectionConverters.* config .entrySet() .asScala @@ -1452,7 +1452,7 @@ case class RudderServiceApi( * See: https://issues.rudder.io/issues/22645 */ object RudderConfigInit { - import RudderParsedProperties._ + import RudderParsedProperties.* /** * Catch all exception during initialization that would prevent initialization. @@ -2133,7 +2133,7 @@ object RudderConfigInit { lazy val resourceFileService = new GitResourceFileService(gitConfigRepo) lazy val apiDispatcher = new RudderEndpointDispatcher(LiftApiProcessingLogger) lazy val rudderApi = { - import com.normation.rudder.rest.lift._ + import com.normation.rudder.rest.lift.* val nodeInheritedProperties = new NodeApiInheritedProperties(nodeFactRepository, roNodeGroupRepository, roLDAPParameterRepository) @@ -3344,7 +3344,7 @@ object RudderConfigInit { ////////////////////////////// Directive Editor and web fields ////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// - import com.normation.cfclerk.domain._ + import com.normation.cfclerk.domain.* object FieldFactoryImpl extends DirectiveFieldFactory { // only one field diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala index 50d091462d5..3de72bf29f6 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderUserDetailsFile.scala @@ -42,15 +42,15 @@ import com.normation.errors.IOResult import com.normation.errors.PureResult import com.normation.errors.SystemError import com.normation.errors.Unexpected -import com.normation.rudder._ -import com.normation.rudder.api._ +import com.normation.rudder.* +import com.normation.rudder.api.* import com.normation.rudder.domain.eventlog.RudderEventActor import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.domain.logger.ApplicationLoggerPure import com.normation.rudder.facts.nodes.NodeSecurityContext import com.normation.rudder.rest.RoleApiMapping -import com.normation.rudder.users._ -import com.normation.zio._ +import com.normation.rudder.users.* +import com.normation.zio.* import java.io.File import java.io.FileInputStream import java.io.InputStream @@ -62,8 +62,8 @@ import org.joda.time.DateTime import org.xml.sax.SAXParseException import scala.collection.immutable.SortedMap import scala.xml.Elem -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * This file contains data structure defining Rudder "user details" and how to diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckNcfTechniqueUpdate.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckNcfTechniqueUpdate.scala index a7d1e682941..179d7fc393a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckNcfTechniqueUpdate.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckNcfTechniqueUpdate.scala @@ -51,8 +51,8 @@ import com.normation.rudder.ncf.ResourceFileState import com.normation.rudder.ncf.ResourceFileState.Untouched import com.normation.rudder.ncf.TechniqueWriter import com.normation.utils.StringUuidGenerator -import com.normation.zio._ -import zio._ +import com.normation.zio.* +import zio.* import zio.syntax.ToZio sealed trait NcfTechniqueUpgradeError extends RudderError { @@ -90,7 +90,7 @@ class CheckNcfTechniqueUpdate( val ncfTechniqueUpdateFlag = File("/opt/rudder/etc/force_ncf_technique_update") - import com.normation.errors._ + import com.normation.errors.* def updateNcfTechniques = { for { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckTechniqueLibraryReload.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckTechniqueLibraryReload.scala index c979adf6895..3c35763ec6f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckTechniqueLibraryReload.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/CheckTechniqueLibraryReload.scala @@ -44,7 +44,7 @@ import com.normation.eventlog.ModificationId import com.normation.rudder.domain.eventlog.RudderEventActor import com.normation.utils.StringUuidGenerator import java.io.File -import net.liftweb.common._ +import net.liftweb.common.* /** * Check at webapp startup if Rudder Technique library has to be reloaded diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/LoadNodeComplianceCache.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/LoadNodeComplianceCache.scala index 4dbf7c058bd..7e2655fda74 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/LoadNodeComplianceCache.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/LoadNodeComplianceCache.scala @@ -39,7 +39,7 @@ package bootstrap.liftweb.checks.action import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.services.nodes.NodeInfoService import com.normation.rudder.services.reports.CacheComplianceQueueAction.ExpectedReportAction import com.normation.rudder.services.reports.CachedFindRuleNodeStatusReports diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/RemoveFaultyLdapEntries.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/RemoveFaultyLdapEntries.scala index 5ce35d6983f..1e2d069036d 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/RemoveFaultyLdapEntries.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/action/RemoveFaultyLdapEntries.scala @@ -45,7 +45,7 @@ import com.normation.rudder.domain.policies.ActiveTechniqueId import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.repository.WoDirectiveRepository import com.normation.utils.StringUuidGenerator -import com.normation.zio._ +import com.normation.zio.* class RemoveFaultyLdapEntries( woLDAPDirectiveRepository: WoDirectiveRepository, diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckConnections.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckConnections.scala index 8e198e97719..f2f74462d9a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckConnections.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckConnections.scala @@ -39,12 +39,12 @@ package bootstrap.liftweb.checks.consistency import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger -import com.normation.box._ +import com.normation.box.* import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection import com.normation.rudder.repository.jdbc.RudderDatasourceProvider import javax.servlet.UnavailableException -import net.liftweb.common._ +import net.liftweb.common.* /** * This class check that all external connection (LDAP, Postgres) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckDIT.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckDIT.scala index b332cc41a33..1f19412cc06 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckDIT.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckDIT.scala @@ -39,18 +39,18 @@ package bootstrap.liftweb.checks.consistency import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.inventory.ldap.core.InventoryDit import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection import com.normation.rudder.domain.RudderDit -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN import javax.servlet.UnavailableException -import net.liftweb.common._ -import zio._ -import zio.syntax._ +import net.liftweb.common.* +import zio.* +import zio.syntax.* /** * This class check that all DIT entries needed for the application diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckRudderGlobalParameter.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckRudderGlobalParameter.scala index 32c903d6006..07ed2f0d0f7 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckRudderGlobalParameter.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CheckRudderGlobalParameter.scala @@ -37,15 +37,15 @@ package bootstrap.liftweb.checks.consistency -import better.files._ +import better.files.* import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger import com.normation.GitVersion -import com.normation.box._ +import com.normation.box.* import com.normation.errors.Inconsistency import com.normation.errors.IOResult import com.normation.eventlog.ModificationId -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.domain.properties.GenericProperty import com.normation.rudder.domain.properties.GlobalParameter import com.normation.rudder.domain.properties.InheritMode @@ -54,9 +54,9 @@ import com.normation.rudder.repository.RoParameterRepository import com.normation.rudder.repository.WoParameterRepository import com.normation.utils.StringUuidGenerator import com.normation.zio.ZioRuntime -import net.liftweb.json._ -import zio._ -import zio.syntax._ +import net.liftweb.json.* +import zio.* +import zio.syntax.* /** * init or reset content of `rudder` global parameters to their default values. diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CloseOpenUserSessions.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CloseOpenUserSessions.scala index 00d78a9ef33..f447daf82e2 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CloseOpenUserSessions.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/consistency/CloseOpenUserSessions.scala @@ -39,8 +39,8 @@ package bootstrap.liftweb.checks.consistency import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger -import com.normation.rudder.users._ -import com.normation.zio._ +import com.normation.rudder.users.* +import com.normation.zio.* import javax.servlet.UnavailableException import org.joda.time.DateTime diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckAddSpecialNodeGroupsDescription.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckAddSpecialNodeGroupsDescription.scala index 997d64df616..9390f9c04ce 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckAddSpecialNodeGroupsDescription.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckAddSpecialNodeGroupsDescription.scala @@ -38,16 +38,16 @@ package bootstrap.liftweb.checks.migration import bootstrap.liftweb.BootstrapChecks -import com.normation.errors._ -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.errors.* +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection import com.normation.rudder.domain.logger.MigrationLoggerPure -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.Modification import com.unboundid.ldap.sdk.ModificationType -import zio._ +import zio.* /* * This migration check looks if we need modify name and description diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckMigrationXmlFileFormat.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckMigrationXmlFileFormat.scala index 43c0eb66752..d1c893be11d 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckMigrationXmlFileFormat.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckMigrationXmlFileFormat.scala @@ -39,8 +39,8 @@ package bootstrap.liftweb.checks.migration import bootstrap.liftweb.BootstrapChecks import com.normation.rudder.domain.logger.MigrationLogger -import com.normation.rudder.migration._ -import net.liftweb.common._ +import com.normation.rudder.migration.* +import net.liftweb.common.* import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import scala.util.Success diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckRemoveRuddercSetting.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckRemoveRuddercSetting.scala index 1256ad455d9..815e6614781 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckRemoveRuddercSetting.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckRemoveRuddercSetting.scala @@ -41,9 +41,9 @@ import bootstrap.liftweb.BootstrapChecks import com.normation.ldap.sdk.LDAPConnectionProvider import com.normation.ldap.sdk.RwLDAPConnection import com.normation.rudder.domain.logger.MigrationLoggerPure -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN -import zio._ +import zio.* class CheckRemoveRuddercSetting( ldap: LDAPConnectionProvider[RwLDAPConnection] diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableScore.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableScore.scala index e0608ea44ef..7c4ffebd16b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableScore.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableScore.scala @@ -37,12 +37,12 @@ package bootstrap.liftweb.checks.migration ************************************************************************************* */ -import bootstrap.liftweb._ +import bootstrap.liftweb.* import com.normation.errors.IOResult import com.normation.rudder.db.Doobie -import com.normation.zio._ -import doobie.implicits._ -import zio.interop.catz._ +import com.normation.zio.* +import doobie.implicits.* +import zio.interop.catz.* import zio.syntax.ToZio /* @@ -52,7 +52,7 @@ class CheckTableScore( doobie: Doobie ) extends BootstrapChecks { - import doobie._ + import doobie.* override def description: String = "Check if score databases exist" diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableUsers.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableUsers.scala index f136632adc2..439fa6b799f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableUsers.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/CheckTableUsers.scala @@ -37,12 +37,12 @@ package bootstrap.liftweb.checks.migration ************************************************************************************* */ -import bootstrap.liftweb._ +import bootstrap.liftweb.* import com.normation.errors.IOResult import com.normation.rudder.db.Doobie -import com.normation.zio._ -import doobie.implicits._ -import zio.interop.catz._ +import com.normation.zio.* +import doobie.implicits.* +import zio.interop.catz.* /* * During 7.3 cycle, we added the registration of users and their sessions in base. @@ -53,7 +53,7 @@ class CheckTableUsers( doobie: Doobie ) extends BootstrapChecks { - import doobie._ + import doobie.* override def description: String = "Check if database tables Users and UserSessions exist and authz column exists in UserSessions table." diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/DbCommonMigration.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/DbCommonMigration.scala index cb492d557b7..3a0e58b42cb 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/DbCommonMigration.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/DbCommonMigration.scala @@ -1,7 +1,7 @@ package bootstrap.liftweb.checks.migration import doobie.ConnectionIO -import doobie.syntax.string._ +import doobie.syntax.string.* /** * Mixin that provides set of utils for SQL migration diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala index 27cf8b54878..c45ec60d529 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateChangeValidationEnforceSchema.scala @@ -43,11 +43,11 @@ import com.normation.errors.RudderError import com.normation.rudder.db.Doobie import com.normation.zio.UnsafeRun import doobie.Transactor -import doobie.implicits._ +import doobie.implicits.* import doobie.util.fragment.Fragment import doobie.util.update.Update0 -import zio._ -import zio.interop.catz._ +import zio.* +import zio.interop.catz.* /* * Ths migration applies a change in the schema of the change requests and workflow table : @@ -58,7 +58,7 @@ class MigrateChangeValidationEnforceSchema( doobie: Doobie ) extends BootstrapChecks with DbCommonMigration { - import doobie._ + import doobie.* val msg: String = "change requests and workflow columns that should be not null (id, state, content)" diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateEventLogEnforceSchema.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateEventLogEnforceSchema.scala index 7b1a49904c3..1e0983417ef 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateEventLogEnforceSchema.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateEventLogEnforceSchema.scala @@ -41,14 +41,14 @@ import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger import com.normation.errors.RudderError import com.normation.rudder.db.Doobie -import com.normation.zio._ +import com.normation.zio.* import doobie.ConnectionIO import doobie.Transactor -import doobie.implicits._ +import doobie.implicits.* import doobie.util.fragment.Fragment import doobie.util.update.Update0 -import zio._ -import zio.interop.catz._ +import zio.* +import zio.interop.catz.* /* * Ths migration applies a change in the schema of the event logs table : @@ -59,7 +59,7 @@ class MigrateEventLogEnforceSchema( doobie: Doobie ) extends BootstrapChecks { - import doobie._ + import doobie.* protected def tableName: String = "eventlog" private def table = Fragment.const(tableName) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateJsonTechniquesToYaml.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateJsonTechniquesToYaml.scala index 0a423f906ea..795ac93eef6 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateJsonTechniquesToYaml.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateJsonTechniquesToYaml.scala @@ -42,16 +42,16 @@ import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger import com.normation.NamedZioLogger import com.normation.cfclerk.services.UpdateTechniqueLibrary -import com.normation.errors._ +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.eventlog.ModificationId import com.normation.rudder.domain.eventlog.RudderEventActor -import com.normation.rudder.ncf._ +import com.normation.rudder.ncf.* import com.normation.rudder.ncf.migration.MigrateJsonTechniquesService import com.normation.rudder.repository.xml.TechniqueFiles import com.normation.utils.StringUuidGenerator -import com.normation.zio._ -import zio._ +import com.normation.zio.* +import zio.* /** * Check at webapp startup if ncf Technique needs to be rewritten by Rudder diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala index e6ece10526a..848da45d35f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala @@ -53,12 +53,12 @@ import com.normation.rudder.services.nodes.history.impl.FactLog import com.normation.rudder.services.nodes.history.impl.FactLogData import com.normation.rudder.services.nodes.history.impl.InventoryHistoryDelete import com.normation.rudder.services.nodes.history.impl.InventoryHistoryLogRepository -import com.normation.zio._ -import doobie.implicits._ +import com.normation.zio.* +import doobie.implicits.* import org.apache.commons.io.FileUtils import org.joda.time.DateTime -import zio._ -import zio.interop.catz._ +import zio.* +import zio.interop.catz.* /* * Before Rudder 8.0, we used to save the state of node when accepted in an LDIF file under @@ -83,7 +83,7 @@ class MigrateNodeAcceptationInventories( MAX_KEEP_REFUSED: Duration ) extends BootstrapChecks { - import doobie._ + import doobie.* val msg = "old inventory accept/refuse facts to 'NodeFacts' database table" diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitUserTemplateLibrary.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitUserTemplateLibrary.scala index 71ee57462f7..896b14b687c 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitUserTemplateLibrary.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitUserTemplateLibrary.scala @@ -39,19 +39,19 @@ package bootstrap.liftweb.checks.onetimeinit import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger -import com.normation.box._ -import com.normation.cfclerk.services._ +import com.normation.box.* +import com.normation.cfclerk.services.* import com.normation.eventlog.ModificationId import com.normation.inventory.ldap.core.LDAPConstants.A_OC -import com.normation.ldap.sdk._ +import com.normation.ldap.sdk.* import com.normation.rudder.batch.AsyncDeploymentActor import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.domain.RudderDit -import com.normation.rudder.domain.RudderLDAPConstants._ +import com.normation.rudder.domain.RudderLDAPConstants.* import com.normation.rudder.domain.eventlog.RudderEventActor -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.utils.StringUuidGenerator -import net.liftweb.common._ +import net.liftweb.common.* import org.joda.time.DateTime /** diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitXmlExport.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitXmlExport.scala index c9795ee4768..c4ae1701e29 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitXmlExport.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/onetimeinit/CheckInitXmlExport.scala @@ -39,14 +39,14 @@ package bootstrap.liftweb.checks.onetimeinit import bootstrap.liftweb.BootstrapChecks import bootstrap.liftweb.BootstrapLogger -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.rudder.domain.eventlog.RudderEventActor import com.normation.rudder.repository.ItemArchiveManager import com.normation.rudder.services.user.PersonIdentService import com.normation.utils.StringUuidGenerator -import net.liftweb.common._ -import zio._ +import net.liftweb.common.* +import zio.* /** * diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/ExtendableSnippet.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/ExtendableSnippet.scala index cc85e02f360..cc82b89872a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/ExtendableSnippet.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/ExtendableSnippet.scala @@ -37,7 +37,7 @@ package com.normation.plugins -import net.liftweb.http._ +import net.liftweb.http.* import scala.reflect.ClassTag import scala.xml.NodeSeq diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala index cb732e58b6a..0ba01c99026 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/PublicPlugin.scala @@ -158,7 +158,7 @@ trait DefaultPluginDef extends RudderPluginDef { PluginLogger.error(s"There is already a menu with id (${newMenu.loc.name}, please contact Plugin team") m } else { - Menu(l, (m.kids :+ newMenu).sortBy(_.loc.name): _*) + Menu(l, (m.kids :+ newMenu).sortBy(_.loc.name)*) } case m => m } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPlugin.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPlugin.scala index ce585fe2a83..7f689ffaebd 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPlugin.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPlugin.scala @@ -44,11 +44,11 @@ import bootstrap.liftweb.RudderProperties import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.rest.EndpointSchema import com.normation.rudder.rest.lift.LiftApiModuleProvider -import com.normation.utils._ -import com.normation.utils.PartType._ +import com.normation.utils.* +import com.normation.utils.PartType.* import com.normation.utils.Separator.Dot import com.normation.utils.Separator.Minus -import com.normation.utils.VersionPart._ +import com.normation.utils.VersionPart.* import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import net.liftweb.sitemap.Menu @@ -192,14 +192,14 @@ trait RudderPluginDef { /* * If the plugin contributes APIs, they must be declared here. */ - def apis: Option[LiftApiModuleProvider[_ <: EndpointSchema]] = None + def apis: Option[LiftApiModuleProvider[? <: EndpointSchema]] = None /* * A visual representation of status/license information, with a * default (overridable) rendering */ def statusInformation(): NodeSeq = { - import net.liftweb.util.Helpers._ + import net.liftweb.util.Helpers.* val info = (
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPluginJson.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPluginJson.scala index 2a5c246daee..57dc5bcce38 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPluginJson.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/RudderPluginJson.scala @@ -38,13 +38,13 @@ package com.normation.plugins import better.files.File -import com.normation.errors._ +import com.normation.errors.* import java.nio.charset.StandardCharsets -import net.liftweb.json._ +import net.liftweb.json.* import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /* * This file is able to read information from /var/rudder/packages/index.json diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/SnippetExtensionRegister.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/SnippetExtensionRegister.scala index a381c816106..397929ca152 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/SnippetExtensionRegister.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/plugins/SnippetExtensionRegister.scala @@ -60,7 +60,7 @@ trait SnippetExtensionRegister { */ def getAfterRenderExtension[T](plugAt: SnippetExtensionKey): Seq[SnippetExtensionPoint[T]] - def register[T <: ExtendableSnippet[_]](extension: SnippetExtensionPoint[T]): Unit + def register[T <: ExtendableSnippet[?]](extension: SnippetExtensionPoint[T]): Unit } @@ -73,16 +73,16 @@ trait SnippetExtensionRegister { */ class SnippetExtensionRegisterImpl extends SnippetExtensionRegister { - private[this] val extendsBefore = scala.collection.mutable.Map.empty[SnippetExtensionKey, Seq[SnippetExtensionPoint[_]]] + private[this] val extendsBefore = scala.collection.mutable.Map.empty[SnippetExtensionKey, Seq[SnippetExtensionPoint[?]]] - private[this] val extendsAfter = scala.collection.mutable.Map.empty[SnippetExtensionKey, Seq[SnippetExtensionPoint[_]]] + private[this] val extendsAfter = scala.collection.mutable.Map.empty[SnippetExtensionKey, Seq[SnippetExtensionPoint[?]]] /** * register the given extension. The extension is added * as the last extension to be applied (and so at * the head of the sequence of extensions) */ - def register[T <: ExtendableSnippet[_]](extension: SnippetExtensionPoint[T]): Unit = { + def register[T <: ExtendableSnippet[?]](extension: SnippetExtensionPoint[T]): Unit = { ApplicationLogger.debug("Registering the extension: " + extension.extendsAt) extendsAfter.get(extension.extendsAt) match { case None => extendsAfter += (extension.extendsAt -> Seq(extension)) @@ -95,7 +95,7 @@ class SnippetExtensionRegisterImpl extends SnippetExtensionRegister { * as the last extension to be applied (and so at * the head of the sequence of extensions) */ - def registerBefore(extension: SnippetExtensionPoint[ExtendableSnippet[_]]): Unit = { + def registerBefore(extension: SnippetExtensionPoint[ExtendableSnippet[?]]): Unit = { ApplicationLogger.debug("Registering the extension: " + extension.extendsAt) extendsBefore.get(extension.extendsAt) match { case None => extendsBefore += (extension.extendsAt -> Seq(extension)) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/ChooseTemplate.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/ChooseTemplate.scala index 0945547c480..e6cea497c98 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/ChooseTemplate.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/ChooseTemplate.scala @@ -37,9 +37,9 @@ package com.normation.rudder.web -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.util.Helpers._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq /** diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala index e4856e6f338..632b2a75f9e 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala @@ -41,18 +41,18 @@ import bootstrap.liftweb.FindCurrentUser import bootstrap.liftweb.RudderConfig import bootstrap.liftweb.RudderConfig.clearCacheService import com.normation.rudder.AuthorizationType -import com.normation.rudder.batch._ +import com.normation.rudder.batch.* import com.normation.rudder.users.CurrentUser import com.normation.rudder.users.RudderUserDetail import com.normation.utils.DateFormaterService -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import org.joda.time.DateTime import scala.util.matching.Regex -import scala.xml._ +import scala.xml.* class AsyncDeployment extends CometActor with CometListener with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentPolicyModeEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentPolicyModeEditForm.scala index ce59cc42074..91f4daa558a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentPolicyModeEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentPolicyModeEditForm.scala @@ -2,10 +2,10 @@ package com.normation.rudder.web.components import com.normation.inventory.domain.NodeId import com.normation.rudder.web.ChooseTemplate -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import scala.xml.NodeSeq class AgentPolicyModeEditForm extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala index 12eea3688f2..eece4f26a02 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala @@ -39,13 +39,13 @@ package com.normation.rudder.web.components import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.web.ChooseTemplate -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq /** @@ -90,7 +90,7 @@ class AgentScheduleEditForm( * Parse a json input into a cf-agent Scedule */ def parseJsonSchedule(s: String): Box[AgentRunInterval] = { - import net.liftweb.json._ + import net.liftweb.json.* val json = parse(s) (for { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala index 0fa992d32a7..10f6ce6bd87 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AutoCompleteAutoSubmit.scala @@ -53,15 +53,15 @@ package com.normation.rudder.web.components * limitations under the License. */ -import _root_.net.liftweb.common._ -import _root_.net.liftweb.http._ -import _root_.net.liftweb.http.js._ -import _root_.net.liftweb.util._ +import _root_.net.liftweb.common.* +import _root_.net.liftweb.http.* +import _root_.net.liftweb.http.js.* +import _root_.net.liftweb.util.* import _root_.scala.xml.Elem -import net.liftweb.http.S._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ +import net.liftweb.http.S.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* /** * A modified version of AutoComplete that accepts an OnSubmit with a JsCmd, and @@ -69,7 +69,7 @@ import net.liftweb.util.Helpers._ */ object AutoCompleteAutoSubmit { def apply(start: String, options: (String, Int) => Seq[String], onSubmit: String => JsCmd, attrs: (String, String)*): Elem = - new AutoCompleteAutoSubmit().render(start, options, onSubmit, attrs: _*) + new AutoCompleteAutoSubmit().render(start, options, onSubmit, attrs*) def apply( start: String, @@ -77,7 +77,7 @@ object AutoCompleteAutoSubmit { onSubmit: String => JsCmd, jsonOptions: List[(String, String)], attrs: (String, String)* - ): Elem = new AutoCompleteAutoSubmit().render(start, options, onSubmit, jsonOptions, attrs: _*) + ): Elem = new AutoCompleteAutoSubmit().render(start, options, onSubmit, jsonOptions, attrs*) def autocompleteObj[T](options: Seq[(T, String)], default: Box[T], onSubmit: T => JsCmd): Elem = new AutoCompleteAutoSubmit().autocompleteObj(options, default, onSubmit) @@ -135,7 +135,7 @@ class AutoCompleteAutoSubmit { val id = Helpers.nextFuncName fmapFunc(onSubmit) { hidden => - val data = JsArray(options.map { case (nonce, name) => JsObj("name" -> name, "nonce" -> nonce) }: _*) + val data = JsArray(options.map { case (nonce, name) => JsObj("name" -> name, "nonce" -> nonce) }*) /* merge the options that the user wants */ val jqOptions = ("minChars", "0") :: @@ -189,7 +189,7 @@ class AutoCompleteAutoSubmit { def render(start: String, options: (String, Int) => Seq[String], onSubmit: String => JsCmd, attrs: (String, String)*): Elem = { val jsonOptions: List[(String, String)] = List() - render(start, options, onSubmit, jsonOptions, attrs: _*) + render(start, options, onSubmit, jsonOptions, attrs*) } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala index 7e90ea68717..492e3e28ddc 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ComplianceModeEditForm.scala @@ -42,14 +42,14 @@ import com.normation.rudder.reports.ComplianceModeName import com.normation.rudder.reports.GlobalComplianceMode import com.normation.rudder.reports.NodeComplianceMode import com.normation.rudder.web.ChooseTemplate -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.json.JsonAST._ -import net.liftweb.util.Helpers._ +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.json.JsonAST.* +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq /** @@ -180,7 +180,7 @@ class ComplianceModeEditForm[T <: ComplianceMode]( def toJs(mode: ComplianceMode): String = { def json: JValue = { - import net.liftweb.json.JsonDSL._ + import net.liftweb.json.JsonDSL.* val baseMode = { ("name" -> mode.name) ~ ("heartbeatPeriod" -> mode.heartbeatPeriod) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveApplicationManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveApplicationManagement.scala index b220949ef01..898493a2c8b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveApplicationManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveApplicationManagement.scala @@ -37,10 +37,10 @@ package com.normation.rudder.web.components -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.rule.category.RuleCategoryId -import net.liftweb.common._ +import net.liftweb.common.* final case class DirectiveApplicationResult( rules: List[RuleId], diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala index 0728a1f36bb..4da798d6249 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala @@ -38,16 +38,16 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.Technique import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueVersion import com.normation.rudder.domain.RudderLDAPConstants -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.policies.PolicyMode._ +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.policies.PolicyMode.* import com.normation.rudder.domain.policies.PolicyModeOverrides.Always import com.normation.rudder.domain.policies.PolicyModeOverrides.Unoverridable -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.workflows.* import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.services.workflows.DGModAction import com.normation.rudder.services.workflows.DirectiveChangeRequest @@ -55,15 +55,15 @@ import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate import com.normation.rudder.web.components.popup.CreateCloneDirectivePopup import com.normation.rudder.web.components.popup.ModificationValidationPopup -import com.normation.rudder.web.model._ -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util._ -import net.liftweb.util.Helpers._ -import scala.xml._ +import com.normation.rudder.web.model.* +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.* +import net.liftweb.util.Helpers.* +import scala.xml.* object DirectiveEditForm { @@ -99,7 +99,7 @@ class DirectiveEditForm( onRemoveSuccessCallBack: () => JsCmd = { () => Noop } ) extends DispatchSnippet with Loggable { - import DirectiveEditForm._ + import DirectiveEditForm.* val currentDirectiveSettingForm = new LocalSnippet[DirectiveEditForm] diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala index 05836478b47..821a924cf65 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala @@ -38,26 +38,26 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.rudder.AuthorizationType import com.normation.rudder.domain.nodes.NodeGroupCategory import com.normation.rudder.domain.nodes.NodeGroupCategoryId -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.model.FormTracker import com.normation.rudder.web.model.WBSelectField import com.normation.rudder.web.model.WBTextAreaField import com.normation.rudder.web.model.WBTextField -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* /** * The form that deals with updating the server group category diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala index 808a592cc02..728f077a905 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala @@ -38,14 +38,14 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.errors.IOResult import com.normation.plugins.DefaultExtendableSnippet import com.normation.rudder.AuthorizationType -import com.normation.rudder.apidata.implicits._ -import com.normation.rudder.domain.nodes._ -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.queries._ +import com.normation.rudder.apidata.implicits.* +import com.normation.rudder.domain.nodes.* +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.queries.* import com.normation.rudder.domain.reports.ComplianceLevelSerialisation import com.normation.rudder.domain.workflows.ChangeRequestId import com.normation.rudder.facts.nodes.QueryContext @@ -56,20 +56,20 @@ import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate import com.normation.rudder.web.components.popup.CreateCloneGroupPopup import com.normation.rudder.web.components.popup.ModificationValidationPopup -import com.normation.rudder.web.model._ -import com.normation.zio._ -import net.liftweb.common._ -import net.liftweb.http._ +import com.normation.rudder.web.model.* +import com.normation.zio.* +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.LocalSnippet -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util._ -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.* +import net.liftweb.util.Helpers.* +import scala.xml.* import zio.ZIO -import zio.json._ -import zio.syntax._ +import zio.json.* +import zio.syntax.* object NodeGroupForm { val templatePath: List[String] = "templates-hidden" :: "components" :: "NodeGroupForm" :: Nil @@ -104,7 +104,7 @@ class NodeGroupForm( }, onFailureCallback: () => JsCmd = { () => Noop } ) extends DispatchSnippet with DefaultExtendableSnippet[NodeGroupForm] with Loggable { - import NodeGroupForm._ + import NodeGroupForm.* implicit private[this] val qc: QueryContext = CurrentUser.queryContext private[this] val nodeFactRepo = RudderConfig.nodeFactRepository diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeStateForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeStateForm.scala index 0ba10abc72e..c0ad491bfd1 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeStateForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeStateForm.scala @@ -40,13 +40,13 @@ package com.normation.rudder.web.components import com.normation.rudder.domain.nodes.NodeState import com.normation.rudder.facts.nodes.CoreNodeFact import com.normation.rudder.web.ChooseTemplate -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.S import net.liftweb.http.SHtml import net.liftweb.http.SHtml.SelectableOption -import net.liftweb.http.js._ -import net.liftweb.util.Helpers._ +import net.liftweb.http.js.* +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq /** diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/PendingChangeRequestDisplayer.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/PendingChangeRequestDisplayer.scala index 73daa6228b7..80c0b9ef956 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/PendingChangeRequestDisplayer.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/PendingChangeRequestDisplayer.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.AuthorizationType import com.normation.rudder.domain.nodes.NodeGroupId import com.normation.rudder.domain.policies.DirectiveUid @@ -49,7 +49,7 @@ import net.liftweb.common.Box import net.liftweb.common.EmptyBox import net.liftweb.common.Full import net.liftweb.common.Loggable -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq /* diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala index 6eb38b6cb99..5d2c87b9705 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCategoryTree.scala @@ -38,21 +38,21 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId -import com.normation.rudder.rule.category._ +import com.normation.rudder.rule.category.* import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.model.JsTreeNode -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.json._ -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.json.* +import net.liftweb.util.Helpers.* +import scala.xml.* /** * A component to display a tree based on a diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala index a8962e49ee6..ca82b1e43a8 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleDisplayer.scala @@ -38,19 +38,19 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.domain.policies.Rule import com.normation.rudder.domain.policies.RuleId -import com.normation.rudder.rule.category._ +import com.normation.rudder.rule.category.* import com.normation.rudder.web.components.popup.CreateOrCloneRulePopup import com.normation.rudder.web.components.popup.RuleCategoryPopup -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import scala.xml._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import scala.xml.* /** * the component in charge of displaying the rule grid, with category tree diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala index f84087d42d6..27decf11c2a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala @@ -38,15 +38,15 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.Technique import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.eventlog.RudderEventActor import com.normation.rudder.domain.logger.TimingDebugLogger -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.facts.nodes.CoreNodeFact -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.services.reports.NodeChanges import com.normation.rudder.users.CurrentUser @@ -55,25 +55,25 @@ import com.normation.rudder.web.services.ComputePolicyMode import com.normation.rudder.web.services.JsTableData import com.normation.rudder.web.services.JsTableLine import com.normation.utils.Control.traverse -import com.normation.zio._ -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ +import com.normation.zio.* +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* import net.liftweb.http.js.JE.AnonFunc -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import net.liftweb.json.JArray import net.liftweb.json.JField import net.liftweb.json.JObject import net.liftweb.json.JsonAST.JValue import net.liftweb.json.JsonParser import net.liftweb.json.JString -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import org.joda.time.Interval import scala.collection.MapView -import scala.concurrent._ +import scala.concurrent.* import scala.concurrent.ExecutionContext.Implicits.global -import scala.xml._ +import scala.xml.* /** * An ADT to denote if a column should be display or not, @@ -154,7 +154,7 @@ class RuleGrid( * Validate Change | | * --------------------------------------------------------- */ - import DisplayColumn._ + import DisplayColumn.* private[this] val showComplianceAndChangesColumn = columnCompliance match { case Force(display) => display case FromConfig => configService.rudder_ui_display_ruleComplianceColumns().toBox.openOr(true) @@ -698,7 +698,7 @@ class RuleGrid( val t5 = System.currentTimeMillis TimingDebugLogger.trace(s"Rule grid: transforming into data: get rule data: callback: ${t5 - t4}ms") - val tags = JsObj(line.rule.tags.map(tag => (tag.name.value, Str(tag.value.value))).toList: _*).toJsCmd + val tags = JsObj(line.rule.tags.map(tag => (tag.name.value, Str(tag.value.value))).toList*).toJsCmd val tagsDisplayed = JsonTagSerialisation.serializeTags(line.rule.tags) RuleLine( line.rule.name, @@ -777,6 +777,6 @@ final case class RuleLine( ("tagsDisplayed", tagsDisplayed) ) - base +* JsObj(optFields: _*) + base +* JsObj(optFields*) } } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala index 251160decce..e2b3fe89fef 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala @@ -38,30 +38,30 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ -import com.normation.inventory.ldap.core.LDAPConstants._ +import com.normation.box.* +import com.normation.inventory.ldap.core.LDAPConstants.* import com.normation.rudder.domain.RudderLDAPConstants.A_NODE_PROPERTY import com.normation.rudder.domain.nodes.NodeInfo -import com.normation.rudder.domain.queries._ +import com.normation.rudder.domain.queries.* import com.normation.rudder.domain.queries.And import com.normation.rudder.domain.queries.CriterionComposition import com.normation.rudder.domain.queries.CriterionLine import com.normation.rudder.domain.queries.Or import com.normation.rudder.web.ChooseTemplate -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.GUIDJsExp import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* import scala.collection.mutable -import scala.collection.mutable.{Map => MutMap} import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.Buffer -import scala.xml._ +import scala.collection.mutable.Map as MutMap +import scala.xml.* /** * The Search Nodes component @@ -88,7 +88,7 @@ class SearchNodeComponent( groupPage: Boolean ) extends DispatchSnippet with Loggable { - import SearchNodeComponent._ + import SearchNodeComponent.* // our local copy of things we work on private[this] var query = _query.map(x => x.copy()) @@ -233,7 +233,7 @@ class SearchNodeComponent( val inputAttributes = ("id", "v_" + index) :: ("class", "queryInputValue form-control form-control-sm") :: { if (cl.comparator.hasValue) Nil else ("disabled", "disabled") :: Nil } - val input = cl.attribute.cType.toForm(cl.value, (x => lines(index) = lines(index).copy(value = x)), inputAttributes: _*) + val input = cl.attribute.cType.toForm(cl.value, (x => lines(index) = lines(index).copy(value = x)), inputAttributes*) (".removeLine *" #> { if (addRemove) SHtml.ajaxSubmit("-", () => removeLine(index), ("class", "btn btn-danger btn-sm fw-bold")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala index a29e3508441..82b1fd850f8 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/ShowNodeDetailsFromNode.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId import com.normation.plugins.DefaultExtendableSnippet @@ -61,14 +61,14 @@ import com.normation.rudder.web.model.JsNodeId import com.normation.rudder.web.services.DisplayNode import com.normation.rudder.web.services.DisplayNode.showDeleteButton import com.normation.rudder.web.services.DisplayNodeGroupTree -import com.softwaremill.quicklens._ -import net.liftweb.common._ +import com.softwaremill.quicklens.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.S import net.liftweb.http.js.JE.JsRaw -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import net.liftweb.http.js.JsExp -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import org.joda.time.DateTime import scala.xml.NodeSeq @@ -91,7 +91,7 @@ class ShowNodeDetailsFromNode( val nodeId: NodeId, groupLib: FullNodeGroupCategory ) extends DispatchSnippet with DefaultExtendableSnippet[ShowNodeDetailsFromNode] with Loggable { - import ShowNodeDetailsFromNode._ + import ShowNodeDetailsFromNode.* private[this] val nodeFactRepo = RudderConfig.nodeFactRepository private[this] val reportDisplayer = RudderConfig.reportDisplayer diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TagsEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TagsEditForm.scala index f90d7f2d965..78a18198a84 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TagsEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TagsEditForm.scala @@ -4,12 +4,12 @@ import com.normation.rudder.domain.policies.JsonTagSerialisation import com.normation.rudder.domain.policies.Tags import com.normation.rudder.repository.json.DataExtractor.CompleteJson import com.normation.rudder.web.ChooseTemplate -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.SHtml -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.CssSel -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq class TagsEditForm(tags: Tags, objectId: String) extends Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala index d90fcbe0e2d..ee4f00f2f1f 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala @@ -38,20 +38,20 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.users.CurrentUser -import com.normation.rudder.web.model._ -import net.liftweb.common._ +import com.normation.rudder.web.model.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* /** * This component allows to display and update a category diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala index 7477b7dbe9e..4ff7f0bcb37 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala @@ -38,26 +38,26 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.Technique import com.normation.cfclerk.domain.TechniqueCategory import com.normation.eventlog.ModificationId import com.normation.rudder.batch.AutomaticStartDeployment import com.normation.rudder.domain.eventlog.RudderEventActor -import com.normation.rudder.domain.policies._ -import com.normation.rudder.services.policies._ +import com.normation.rudder.domain.policies.* +import com.normation.rudder.services.policies.* import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate -import com.normation.rudder.web.model._ -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util._ -import net.liftweb.util.Helpers._ +import com.normation.rudder.web.model.* +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.* +import net.liftweb.util.Helpers.* import org.joda.time.DateTime -import scala.xml._ +import scala.xml.* object TechniqueEditForm { @@ -99,7 +99,7 @@ class TechniqueEditForm( onSuccessCallback: () => JsCmd = { () => Noop }, onFailureCallback: () => JsCmd = { () => Noop } ) extends DispatchSnippet with Loggable { - import TechniqueEditForm._ + import TechniqueEditForm.* // find Technique private[this] val techniqueRepository = RudderConfig.techniqueRepository @@ -257,7 +257,7 @@ class TechniqueEditForm( } private[this] val crReasons = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) @@ -266,7 +266,7 @@ class TechniqueEditForm( } private[this] val crReasonsRemovePopup = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) @@ -275,7 +275,7 @@ class TechniqueEditForm( } private[this] val crReasonsDisablePopup = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala index 9b7ce8c085b..956ec2d7bf9 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala @@ -38,18 +38,18 @@ package com.normation.rudder.web.components import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.Technique import com.normation.errors -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.repository.FullNodeGroupCategory -import com.normation.rudder.services.policies._ +import com.normation.rudder.services.policies.* import com.normation.rudder.web.model.JsTreeNode -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import scala.xml._ +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import scala.xml.* /** * A component to display a tree based on a diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala index de5da0448ac..482c2a2b419 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateActiveTechniqueCategoryPopup.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.rudder.domain.policies.ActiveTechniqueCategory import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId @@ -48,15 +48,15 @@ import com.normation.rudder.web.model.FormTracker import com.normation.rudder.web.model.WBSelectField import com.normation.rudder.web.model.WBTextAreaField import com.normation.rudder.web.model.WBTextField -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* class CreateActiveTechniqueCategoryPopup( onSuccessCallback: () => JsCmd = { () => Noop }, diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala index 423ca0b3485..811f3105362 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala @@ -38,12 +38,12 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.policies.NonGroupRuleTarget -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate import com.normation.rudder.web.model.FormTracker @@ -51,16 +51,16 @@ import com.normation.rudder.web.model.WBRadioField import com.normation.rudder.web.model.WBSelectField import com.normation.rudder.web.model.WBTextAreaField import com.normation.rudder.web.model.WBTextField -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* /** * Create a group or a category @@ -311,7 +311,7 @@ class CreateCategoryOrGroupPopup( } private[this] val piReasons = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala index 39b7f0531ff..6cf8a45a7ee 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala @@ -39,24 +39,24 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig import com.normation.GitVersion -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueVersion import com.normation.eventlog.ModificationId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.users.CurrentUser -import com.normation.rudder.web.components.popup.CreateCloneDirectivePopup._ +import com.normation.rudder.web.components.popup.CreateCloneDirectivePopup.* import com.normation.rudder.web.model.FormTracker import com.normation.rudder.web.model.WBTextAreaField import com.normation.rudder.web.model.WBTextField -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* object CreateCloneDirectivePopup { val htmlId_popupContainer = "createCloneDirectiveContainer" @@ -125,7 +125,7 @@ class CreateCloneDirectivePopup( ///////////// fields for category settings /////////////////// private[this] val reasons = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala index a9aea24e155..2ed0bf48918 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala @@ -1,10 +1,10 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.policies.NonGroupRuleTarget import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate @@ -13,17 +13,17 @@ import com.normation.rudder.web.model.WBRadioField import com.normation.rudder.web.model.WBSelectField import com.normation.rudder.web.model.WBTextAreaField import com.normation.rudder.web.model.WBTextField -import com.normation.zio._ -import net.liftweb.common._ +import com.normation.zio.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* class CreateCloneGroupPopup( nodeGroup: Option[NodeGroup], @@ -205,7 +205,7 @@ class CreateCloneGroupPopup( ///////////// fields for category settings /////////////////// private[this] val groupReasons = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala index 88a032c32db..8d490644c23 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig import com.normation.GitVersion -import com.normation.box._ +import com.normation.box.* import com.normation.errors.PureResult import com.normation.inventory.domain.InventoryError.Inconsistency import com.normation.rudder.domain.properties.AddGlobalParameterDiff @@ -54,19 +54,19 @@ import com.normation.rudder.services.workflows.GlobalParamChangeRequest import com.normation.rudder.services.workflows.GlobalParamModAction import com.normation.rudder.services.workflows.WorkflowService import com.normation.rudder.users.CurrentUser -import com.normation.rudder.web.model._ +import com.normation.rudder.web.model.* import com.typesafe.config.ConfigValue import com.typesafe.config.ConfigValueType import java.util.regex.Pattern -import net.liftweb.common._ -import net.liftweb.http._ +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.DispatchSnippet -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* class CreateOrUpdateGlobalParameterPopup( change: GlobalParamChangeRequest, @@ -117,7 +117,7 @@ class CreateOrUpdateGlobalParameterPopup( } private def parseValue(value: String, jsonRequired: Boolean): PureResult[ConfigValue] = { - import GenericProperty._ + import GenericProperty.* for { // in case of string, we need to force parse as string v <- if (jsonRequired) GenericProperty.parseValue(value) else Right(value.toConfigValue) @@ -314,7 +314,7 @@ class CreateOrUpdateGlobalParameterPopup( val parameterOverridable = true private[this] val paramReasons = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala index bd53bd138c2..d6694b3ff24 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala @@ -37,9 +37,9 @@ package com.normation.rudder.web.components.popup -import CreateOrCloneRulePopup._ +import CreateOrCloneRulePopup.* import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.rudder.domain.policies.Rule import com.normation.rudder.domain.policies.RuleId @@ -52,16 +52,16 @@ import com.normation.rudder.web.model.FormTracker import com.normation.rudder.web.model.WBSelectField import com.normation.rudder.web.model.WBTextAreaField import com.normation.rudder.web.model.WBTextField -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml import net.liftweb.http.Templates -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* class CreateOrCloneRulePopup( rootRuleCategory: RuleCategory, @@ -133,7 +133,7 @@ class CreateOrCloneRulePopup( ///////////// fields for category settings /////////////////// private[this] val reason = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ExpectedPolicyPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ExpectedPolicyPopup.scala index 82447f95974..45017587fe6 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ExpectedPolicyPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ExpectedPolicyPopup.scala @@ -38,17 +38,17 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.domain.policies.Rule import com.normation.rudder.domain.policies.RuleTarget import com.normation.rudder.domain.servers.Srv import com.normation.rudder.web.ChooseTemplate import com.normation.rudder.web.components.DisplayColumn import com.normation.rudder.web.components.RuleGrid -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.util.ClearClearable -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq import scala.xml.Text @@ -67,7 +67,7 @@ class ExpectedPolicyPopup( htmlId_popup: String, nodeSrv: Srv ) extends DispatchSnippet with Loggable { - import ExpectedPolicyPopup._ + import ExpectedPolicyPopup.* private[this] val ruleRepository = RudderConfig.roRuleRepository private[this] val dynGroupService = RudderConfig.dynGroupService diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala index 654dc83e405..11a50cdf08e 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueName import com.normation.eventlog.ModificationId import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId @@ -47,15 +47,15 @@ import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate import com.normation.rudder.web.model.FormTracker import com.normation.rudder.web.model.WBTextAreaField -import com.normation.rudder.web.services.ReasonBehavior._ -import net.liftweb.common._ +import com.normation.rudder.web.services.ReasonBehavior.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* +import scala.xml.* class GiveReasonPopup( onSuccessCallback: (ActiveTechniqueId) => JsCmd = { (ActiveTechniqueId) => Noop }, diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala index dbf4d67871e..04d30fe1875 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueName import com.normation.eventlog.ModificationId @@ -49,8 +49,8 @@ import com.normation.rudder.domain.nodes.ChangeRequestNodeGroupDiff import com.normation.rudder.domain.nodes.DeleteNodeGroupDiff import com.normation.rudder.domain.nodes.ModifyToNodeGroupDiff import com.normation.rudder.domain.nodes.NodeGroup -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.workflows._ +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.workflows.* import com.normation.rudder.services.workflows.ChangeRequestService import com.normation.rudder.services.workflows.DGModAction import com.normation.rudder.services.workflows.DirectiveChangeRequest @@ -60,16 +60,16 @@ import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate import com.normation.rudder.web.components.DisplayColumn import com.normation.rudder.web.components.RuleGrid -import com.normation.rudder.web.model._ -import net.liftweb.common._ +import com.normation.rudder.web.model.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* /** * Validation pop-up for modification on group and directive. @@ -202,7 +202,7 @@ class ModificationValidationPopup( parentFormTracker: FormTracker ) extends DispatchSnippet with Loggable { - import ModificationValidationPopup._ + import ModificationValidationPopup.* private[this] val userPropertyService = RudderConfig.userPropertyService private[this] val dependencyService = RudderConfig.dependencyAndDeletionService @@ -256,7 +256,7 @@ class ModificationValidationPopup( // must be here because used in val popupWarningMessages private[this] val crReasons = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala index 888063a4529..3dde9a2696b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleCategoryPopup.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.rudder.rule.category.RuleCategory import com.normation.rudder.rule.category.RuleCategoryId @@ -48,15 +48,15 @@ import com.normation.rudder.web.model.FormTracker import com.normation.rudder.web.model.WBSelectField import com.normation.rudder.web.model.WBTextAreaField import com.normation.rudder.web.model.WBTextField -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.FieldError -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* /** * Create a group or a category diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala index b66427a60ec..d4dff63703c 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala @@ -37,7 +37,7 @@ package com.normation.rudder.web.components.popup import bootstrap.liftweb.RudderConfig -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.workflows.ChangeRequestId import com.normation.rudder.services.workflows.ChangeRequestService import com.normation.rudder.services.workflows.RuleChangeRequest @@ -45,15 +45,15 @@ import com.normation.rudder.services.workflows.RuleModAction import com.normation.rudder.services.workflows.WorkflowService import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate -import com.normation.rudder.web.model._ -import net.liftweb.common._ +import com.normation.rudder.web.model.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import net.liftweb.http.SHtml -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* +import scala.xml.* /** * Validation pop-up for modification on rules only. @@ -98,7 +98,7 @@ class RuleModificationValidationPopup( parentFormTracker: Option[FormTracker] = None ) extends DispatchSnippet with Loggable { - import RuleModificationValidationPopup._ + import RuleModificationValidationPopup.* private[this] val userPropertyService = RudderConfig.userPropertyService @@ -107,7 +107,7 @@ class RuleModificationValidationPopup( def dispatch: PartialFunction[String, NodeSeq => NodeSeq] = { case "popupContent" => { _ => popupContent() } } def popupContent(): NodeSeq = { - import RuleModAction._ + import RuleModAction.* val (buttonName, classForButton) = (validationNeeded, changeRequest.action) match { case (false, Update) => ("Update", "btn-success") case (false, Delete) => ("Delete", "btn-danger") @@ -164,7 +164,7 @@ class RuleModificationValidationPopup( ///////////// fields for category settings /////////////////// private[this] val crReasons = { - import com.normation.rudder.web.services.ReasonBehavior._ + import com.normation.rudder.web.services.ReasonBehavior.* (userPropertyService.reasonsFieldBehavior: @unchecked) match { case Disabled => None case Mandatory => Some(buildReasonField(true, "subContainerReasonField")) @@ -224,7 +224,7 @@ class RuleModificationValidationPopup( } private[this] def ruleDiffFromAction(): Box[ChangeRequestRuleDiff] = { - import RuleModAction._ + import RuleModAction.* changeRequest.previousRule match { case None => diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala index d6e08bcb217..4c30d7ac2b0 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala @@ -37,7 +37,7 @@ package com.normation.rudder.web.model -import com.normation.cfclerk.domain._ +import com.normation.cfclerk.domain.* import com.normation.cfclerk.domain.HashAlgoConstraint.PLAIN import com.normation.cfclerk.domain.HashAlgoConstraint.PreHashed import com.normation.rudder.domain.appconfig.FeatureSwitch @@ -45,23 +45,23 @@ import com.normation.rudder.domain.appconfig.FeatureSwitch.Disabled import com.normation.rudder.domain.appconfig.FeatureSwitch.Enabled import com.normation.rudder.services.policies.JsEngine import com.normation.rudder.web.ChooseTemplate -import com.normation.utils.Utils._ +import com.normation.utils.Utils.* import java.io.File -import net.liftweb.common._ -import net.liftweb.http._ +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.SHtml.ChoiceHolder -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.CssSel import net.liftweb.util.FieldError import net.liftweb.util.Helpers -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import org.joda.time.DateTime import org.joda.time.LocalDate import org.joda.time.LocalTime import org.joda.time.Period import org.joda.time.format.DateTimeFormatter -import scala.xml._ +import scala.xml.* /** * This field is a simple input text, without any @@ -143,7 +143,7 @@ class ReadOnlyTextField(val id: String) extends DirectiveField { def set(x: String): String = { if (null == x) _x = "" else _x = x; _x } def toForm: Full[Elem] = { val attrs = if (isReadOnly) Seq(("readonly" -> "readonly")) else Seq() - Full(SHtml.text(toClient, x => parseClient(x), attrs: _*)) + Full(SHtml.text(toClient, x => parseClient(x), attrs*)) } def manifest: Manifest[String] = manifestOf[String] @@ -709,7 +709,7 @@ class PasswordField( * */ def parseClient(s: String): Unit = { - import net.liftweb.json._ + import net.liftweb.json.* errors = Nil val json = parse(s) (for { @@ -792,7 +792,7 @@ class PasswordField( // add a mapping between algo names and what is displayed, because having // linux-... or aix-... does not make sense in that context implicit class AlgoToDisplayName(a: HashAlgoConstraint) { - import com.normation.cfclerk.domain.HashAlgoConstraint._ + import com.normation.cfclerk.domain.HashAlgoConstraint.* def name: String = a match { case PLAIN => "Plain text" @@ -809,11 +809,11 @@ class PasswordField( } def toForm: Full[NodeSeq] = { - val hashes = JsObj(algos.filterNot(x => x == PLAIN || x == PreHashed).map(a => (a.prefix, Str(a.name))): _*) + val hashes = JsObj(algos.filterNot(x => x == PLAIN || x == PreHashed).map(a => (a.prefix, Str(a.name)))*) val formId = Helpers.nextFuncName val valueInput = SHtml.text("", s => parseClient(s), ("class", "input-result")) val otherPasswords = - if (slavesValues().size == 0) "undefined" else JsObj(slavesValues().view.mapValues(Str(_)).toSeq: _*).toJsCmd + if (slavesValues().size == 0) "undefined" else JsObj(slavesValues().view.mapValues(Str(_)).toSeq*).toJsCmd val (scriptEnabled, isScript, currentValue) = scriptSwitch().getOrElse(Disabled) match { case Disabled => (false, false, currentHash) case Enabled => diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala index 8e60bf09b8f..cb09e0ce2a8 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/JsTreeNode.scala @@ -37,8 +37,8 @@ package com.normation.rudder.web.model -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.util.Helpers.* +import scala.xml.* /** * Something that is displayable as a tree node. diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala index 0d779d106da..e72a4ea443a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/RudderBaseField.scala @@ -37,17 +37,17 @@ package com.normation.rudder.web.model -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.SHtml -import net.liftweb.http.SHtml._ -import net.liftweb.http.SHtml.ElemAttr._ +import net.liftweb.http.SHtml.* +import net.liftweb.http.SHtml.ElemAttr.* import net.liftweb.util.BaseField import net.liftweb.util.FieldContainer import net.liftweb.util.FieldError import net.liftweb.util.Helpers -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import net.liftweb.util.StringValidators -import scala.xml._ +import scala.xml.* /** * A simple class that allows to register error information @@ -255,7 +255,7 @@ class WBCheckboxField( ) extends RudderBaseField { type ValueType = Boolean - def inputField: Elem = {SHtml.checkbox(value, set _, (attrs: Seq[ElemAttr]): _*)} + def inputField: Elem = {SHtml.checkbox(value, set _, (attrs: Seq[ElemAttr])*)} } class WBSelectField( @@ -274,7 +274,7 @@ class WBSelectField( } } - def inputField: Elem = SHtml.select(opts, defaultVal, set _, attrs: _*) + def inputField: Elem = SHtml.select(opts, defaultVal, set _, attrs*) protected def valueTypeToBoxString(in: ValueType): Box[String] = Full(in) protected def boxStrToValType(in: Box[String]): ValueType = in openOr ("") @@ -297,7 +297,7 @@ class WBSelectObjField[T]( Empty } - def inputField: Elem = SHtml.selectObj[T](opts, defaultVal, set _, attrs: _*) + def inputField: Elem = SHtml.selectObj[T](opts, defaultVal, set _, attrs*) } class WBRadioField( @@ -322,7 +322,7 @@ class WBRadioField( } } - def choiceHolder: ChoiceHolder[String] = SHtml.radio(opts, Full(value), set _, parameters: _*) + def choiceHolder: ChoiceHolder[String] = SHtml.radio(opts, Full(value), set _, parameters*) def inputField: Elem = {
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/SessionVars.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/SessionVars.scala index 8e955d0904e..533d87ea255 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/SessionVars.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/SessionVars.scala @@ -38,6 +38,6 @@ package com.normation.rudder.web.model //lift std import -import net.liftweb.http._ // For implicits +import net.liftweb.http.* // For implicits object CurrentDirectiveEditor extends SessionVar[Option[DirectiveEditor]](None) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala index 9f2870fa118..c515ad53ba0 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/AsyncComplianceService.scala @@ -37,24 +37,24 @@ package com.normation.rudder.web.services -import com.normation.box._ +import com.normation.box.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.logger.TimingDebugLogger import com.normation.rudder.domain.policies.RuleId import com.normation.rudder.domain.reports.ComplianceLevel -import com.normation.rudder.domain.reports.ComplianceLevelSerialisation._ +import com.normation.rudder.domain.reports.ComplianceLevelSerialisation.* import com.normation.rudder.domain.reports.RuleNodeStatusReport import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.services.reports.ReportingService import com.normation.rudder.users.CurrentUser -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.common.Box import net.liftweb.http.SHtml -import net.liftweb.http.js.JE._ +import net.liftweb.http.js.JE.* import net.liftweb.http.js.JsCmd -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.Helpers.TimeSpan -import scala.concurrent._ +import scala.concurrent.* import scala.concurrent.ExecutionContext.Implicits.global class AsyncComplianceService( diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ComplianceData.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ComplianceData.scala index c03d01a10e5..d9ce09618e5 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ComplianceData.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ComplianceData.scala @@ -42,18 +42,18 @@ import com.normation.cfclerk.domain.TechniqueVersion import com.normation.cfclerk.xmlparsers.CfclerkXmlConstants.DEFAULT_COMPONENT_KEY import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.nodes.NodeInfo -import com.normation.rudder.domain.policies._ -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.policies.* +import com.normation.rudder.domain.reports.* import com.normation.rudder.facts.nodes.CoreNodeFact import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.repository.FullNodeGroupCategory import com.normation.utils.DateFormaterService -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js.JE._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.JE.* import net.liftweb.http.js.JsExp import net.liftweb.json.JsonAST.JValue -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import org.joda.time.Interval import scala.collection.MapView @@ -120,7 +120,7 @@ object ChangeLine { } } - JsArray(jsonChanges.toSeq: _*) + JsArray(jsonChanges.toSeq*) } } diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala index 6cdf15bf8b2..3fa70356759 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala @@ -44,17 +44,17 @@ import com.normation.rudder.AuthorizationType import com.normation.rudder.domain.policies.Directive import com.normation.rudder.domain.policies.DirectiveUid import com.normation.rudder.domain.policies.GlobalPolicyMode -import com.normation.rudder.domain.policies.PolicyModeOverrides._ +import com.normation.rudder.domain.policies.PolicyModeOverrides.* import com.normation.rudder.repository.FullActiveTechnique import com.normation.rudder.repository.FullActiveTechniqueCategory import com.normation.rudder.web.model.JsTreeNode import net.liftweb.common.Loggable import net.liftweb.http.S import net.liftweb.http.SHtml -import net.liftweb.http.js.JE._ +import net.liftweb.http.js.JE.* import net.liftweb.http.js.JE.JsRaw import net.liftweb.http.js.JsCmd -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.Helpers import scala.xml.Elem import scala.xml.NodeSeq @@ -140,7 +140,7 @@ object DisplayDirectiveTree extends Loggable { keepTechnique: FullActiveTechnique => Boolean = _ => true, keepDirective: Directive => Boolean = _ => true ): NodeSeq = { - import scala.xml.Utility.{escape => escapeHTML} + import scala.xml.Utility.escape as escapeHTML def displayCategory( category: FullActiveTechniqueCategory, @@ -241,7 +241,7 @@ object DisplayDirectiveTree extends Loggable { case Some(technique) => val btnCreateDirective = createDirective match { case Some(newDirective) => - import net.liftweb.http.js.JsExp._ + import net.liftweb.http.js.JsExp.* if (userService.getCurrentUser.checkRights(AuthorizationType.Directive.Write)) { JsArray(diagramData._1), "values" -> JsArray(diagramData._2), "colors" -> JsArray(diagramData._3)) - val diagramColor = JsObj(sorted.map(_.jsColor): _*) + val diagramColor = JsObj(sorted.map(_.jsColor)*) // Data used for compliance bar, compliance without pending val (complianceBar, globalCompliance) = global match { case Some((bar, value)) => - import com.normation.rudder.domain.reports.ComplianceLevelSerialisation._ + import com.normation.rudder.domain.reports.ComplianceLevelSerialisation.* (bar.copy(pending = 0).toJsArray, value) case None => (JsArray(Nil), -1L) @@ -355,7 +355,7 @@ class HomePage extends StatefulSnippet { // mapping between os name and their string representation (printed on screen). - val osNames = JsObj(osTypes.map(os => (S.?("os.name." + os.name), Str(os.name))): _*) + val osNames = JsObj(osTypes.map(os => (S.?("os.name." + os.name), Str(os.name)))*) val machines = HomePage.nodeFacts.get.values.map { _.machine.machineType match { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Index.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Index.scala index cd368374ff8..6c79e67fb18 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Index.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Index.scala @@ -40,8 +40,8 @@ package com.normation.rudder.web.snippet //lift std import import com.normation.rudder.AuthorizationType import com.normation.rudder.users.CurrentUser -import net.liftweb.http._ -import scala.xml._ +import net.liftweb.http.* +import scala.xml.* /** * Manage redirection for index pages diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/PluginExpirationInfo.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/PluginExpirationInfo.scala index 35d688ff098..9d3650b495b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/PluginExpirationInfo.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/PluginExpirationInfo.scala @@ -39,8 +39,8 @@ package com.normation.rudder.web.snippet import bootstrap.liftweb.PluginsInfo import com.normation.plugins.PluginStatusInfo -import com.softwaremill.quicklens._ -import net.liftweb.common._ +import com.softwaremill.quicklens.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import org.joda.time.DateTime import scala.xml.NodeSeq diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala index fb81669bfd9..5fbef05d062 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/RegisterToasts.scala @@ -37,10 +37,10 @@ package com.normation.rudder.web.snippet -import net.liftweb.http._ -import net.liftweb.http.js.JE._ +import net.liftweb.http.* +import net.liftweb.http.js.JE.* import net.liftweb.http.js.JsCmd -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import scala.xml.NodeSeq import scala.xml.Utility diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/SetupRedirect.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/SetupRedirect.scala index 01b7bf939a9..155b86ad117 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/SetupRedirect.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/SetupRedirect.scala @@ -38,14 +38,14 @@ package com.normation.rudder.web.snippet import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.rudder.AuthorizationType.Administration import com.normation.rudder.users.CurrentUser -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.CurrentReq import net.liftweb.http.DispatchSnippet import net.liftweb.http.js.JsCmd -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import scala.xml.NodeSeq class SetupRedirect extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/UserInformation.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/UserInformation.scala index 401971bf992..5b01a98bdae 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/UserInformation.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/UserInformation.scala @@ -44,12 +44,12 @@ import com.normation.rudder.Role import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.users.CurrentUser import com.normation.utils.DateFormaterService -import com.normation.zio._ -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ +import com.normation.zio.* +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* import net.liftweb.util.CssSel -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import org.springframework.security.core.context.SecurityContextHolder import scala.xml.NodeSeq diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Util.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Util.scala index e22f0ebf8b7..e98a9c4fe0b 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Util.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Util.scala @@ -37,11 +37,11 @@ package com.normation.rudder.web.snippet -import net.liftweb.http._ // For implicits +import net.liftweb.http.* // For implicits import org.slf4j.Logger import org.slf4j.LoggerFactory //lift std import -import scala.xml._ +import scala.xml.* object Util { val logger: Logger = LoggerFactory.getLogger(classOf[Util]) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala index a64065ed562..e572629b036 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/Archives.scala @@ -38,21 +38,21 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig -import com.normation.box._ -import com.normation.errors._ +import com.normation.box.* +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.rudder.git.GitArchiveId import com.normation.rudder.git.GitCommitId -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.users.CurrentUser import com.normation.utils.DateFormaterService -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* import org.eclipse.jgit.lib.PersonIdent import org.joda.time.DateTime import scala.xml.NodeSeq diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ClearCache.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ClearCache.scala index d4723f8a08f..144dc1ab6f9 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ClearCache.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/ClearCache.scala @@ -39,14 +39,14 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig import com.normation.rudder.users.CurrentUser -import net.liftweb._ -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ +import net.liftweb.* +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* import net.liftweb.http.js.JE.JsRaw -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import scala.xml.NodeSeq -import util.Helpers._ +import util.Helpers.* class ClearCache extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala index 0fe9e058671..0913de39284 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DatabaseManagement.scala @@ -39,19 +39,19 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig import com.normation.inventory.domain.MemorySize -import com.normation.rudder.domain.reports._ +import com.normation.rudder.domain.reports.* import com.normation.utils.DateFormaterService -import net.liftweb.common._ -import net.liftweb.http._ +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.DispatchSnippet -import net.liftweb.http.js._ +import net.liftweb.http.js.* import net.liftweb.http.js.JE.JsRaw -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat import org.joda.time.format.DateTimeFormatter -import scala.xml._ +import scala.xml.* class DatabaseManagement extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DyngroupReloading.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DyngroupReloading.scala index 4b28c0bbd90..71a046eee64 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DyngroupReloading.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/DyngroupReloading.scala @@ -38,12 +38,12 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* import net.liftweb.http.js.JE.JsRaw -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq class DyngroupReloading extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala index 60049819233..7fa0269dfc8 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala @@ -39,7 +39,7 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig import collection.mutable.Buffer -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.EventLogDetails import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId @@ -49,16 +49,16 @@ import com.normation.rudder.domain.eventlog.AuthorizedNetworkModification import com.normation.rudder.domain.eventlog.UpdatePolicyServer import com.normation.rudder.services.servers.AllowedNetwork import com.normation.rudder.users.CurrentUser -import com.normation.zio._ -import net.liftweb._ -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ +import com.normation.zio.* +import net.liftweb.* +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* import net.liftweb.util.CssSel import scala.xml.NodeSeq -import util.Helpers._ +import util.Helpers.* class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EventLogsViewer.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EventLogsViewer.scala index bd174484179..d9fbb513184 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EventLogsViewer.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EventLogsViewer.scala @@ -38,10 +38,10 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.EventLog -import doobie._ -import net.liftweb.common._ +import doobie.* +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet import scala.xml.NodeSeq diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PluginManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PluginManagement.scala index c9e29a9727d..f00965799f2 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PluginManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PluginManagement.scala @@ -40,9 +40,9 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.PluginsInfo import bootstrap.liftweb.RudderConfig import com.normation.plugins.RudderPluginDef -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.DispatchSnippet -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq class PluginManagement extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala index a0619bdf267..71cbe100107 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/PropertiesManagement.scala @@ -38,8 +38,8 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig -import com.normation.appconfig._ -import com.normation.box._ +import com.normation.appconfig.* +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.rudder.AuthorizationType import com.normation.rudder.batch.AutomaticStartDeployment @@ -49,21 +49,21 @@ import com.normation.rudder.reports.AgentRunInterval import com.normation.rudder.reports.GlobalComplianceMode import com.normation.rudder.services.policies.SendMetrics import com.normation.rudder.services.servers.RelaySynchronizationMethod -import com.normation.rudder.services.servers.RelaySynchronizationMethod._ +import com.normation.rudder.services.servers.RelaySynchronizationMethod.* import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.components.AgentPolicyModeEditForm import com.normation.rudder.web.components.AgentScheduleEditForm import com.normation.rudder.web.components.ComplianceModeEditForm import java.nio.charset.StandardCharsets import java.nio.file.attribute.PosixFilePermission -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.SHtml._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util._ -import net.liftweb.util.Helpers._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.SHtml.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.* +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq import scala.xml.Text @@ -645,7 +645,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable { */ def getHookPerm(isExec: Boolean): Set[PosixFilePermission] = { // property file should be either rwxr--r-- or rw-r--r-- - import java.nio.file.attribute.PosixFilePermission._ + import java.nio.file.attribute.PosixFilePermission.* val perms = Set(OWNER_READ, OWNER_WRITE, GROUP_READ, OTHERS_READ) if (isExec) perms + OWNER_EXECUTE + GROUP_EXECUTE + OTHERS_EXECUTE else perms @@ -653,7 +653,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable { def generationHookCfpromise: NodeSeq => NodeSeq = { (xml: NodeSeq) => { - import better.files._ + import better.files.* val hook = File("/opt/rudder/etc/hooks.d/policy-generation-node-ready/10-cf-promise-check") val disabled = !(hook.exists() && hook.isWritable) @@ -710,7 +710,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable { } def generationHookTriggerNodeUpdate: NodeSeq => NodeSeq = { - import better.files._ + import better.files.* type Result[T] = Either[String, T] val hookPath = "/opt/rudder/etc/hooks.d/policy-generation-finished/60-trigger-node-update" val propPath = hookPath + ".properties" @@ -1012,7 +1012,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable { } def directiveScriptEngineConfiguration: NodeSeq => NodeSeq = { (xml: NodeSeq) => - import com.normation.rudder.domain.appconfig.FeatureSwitch._ + import com.normation.rudder.domain.appconfig.FeatureSwitch.* (configService.rudder_featureSwitch_directiveScriptEngine().toBox match { case Full(initialValue) => @@ -1155,7 +1155,7 @@ class PropertiesManagement extends DispatchSnippet with Loggable { } def unexpectedReportInterpretation: NodeSeq => NodeSeq = { (xml: NodeSeq) => - import com.normation.rudder.services.reports.UnexpectedReportBehavior._ + import com.normation.rudder.services.reports.UnexpectedReportBehavior.* (configService.rudder_compliance_unexpected_report_interpretation().toBox match { case Full(initialValue) => diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/SupportScript.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/SupportScript.scala index a72c7b8f1c1..888cbe07712 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/SupportScript.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/SupportScript.scala @@ -43,7 +43,7 @@ import net.liftweb.http.IdMemoizeTransform import net.liftweb.http.S import net.liftweb.http.SHtml import net.liftweb.http.js.JsCmd -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import scala.xml.NodeSeq import scala.xml.Text diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala index 12c6a0112c7..220a82b89da 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala @@ -38,20 +38,20 @@ package com.normation.rudder.web.snippet.administration import bootstrap.liftweb.RudderConfig -import com.normation.box._ -import com.normation.cfclerk.domain._ +import com.normation.box.* +import com.normation.cfclerk.domain.* import com.normation.eventlog.ModificationId import com.normation.rudder.AuthorizationType import com.normation.rudder.domain.eventlog.RudderEventActor -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.users.CurrentUser -import com.normation.rudder.web.components._ +import com.normation.rudder.web.components.* import com.normation.rudder.web.components.popup.CreateActiveTechniqueCategoryPopup import com.normation.rudder.web.components.popup.GiveReasonPopup import com.normation.rudder.web.model.JsTreeNode import com.normation.rudder.web.services.AgentCompat -import com.normation.rudder.web.services.ReasonBehavior._ -import net.liftweb.common._ +import com.normation.rudder.web.services.ReasonBehavior.* +import net.liftweb.common.* import net.liftweb.common.Box.box2Option import net.liftweb.common.Box.option2Box import net.liftweb.http.DispatchSnippet @@ -59,12 +59,12 @@ import net.liftweb.http.LocalSnippet import net.liftweb.http.S import net.liftweb.http.SHtml import net.liftweb.http.SHtml.ElemAttr.pairToBasic -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.json._ -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.json.* +import net.liftweb.util.Helpers.* +import scala.xml.* /** * Snippet for managing the System and User Technique libraries. @@ -78,7 +78,7 @@ import scala.xml._ */ class TechniqueLibraryManagement extends DispatchSnippet with Loggable { - import TechniqueLibraryManagement._ + import TechniqueLibraryManagement.* private[this] val techniqueRepository = RudderConfig.techniqueRepository private[this] val updatePTLibService = RudderConfig.updateTechniqueLibrary diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala index 7ee096eca0f..a51efae8b4d 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala @@ -40,9 +40,9 @@ package com.normation.rudder.web.snippet.configuration import bootstrap.liftweb.RudderConfig import com.normation.GitVersion import com.normation.GitVersion.ParseRev -import com.normation.box._ +import com.normation.box.* import com.normation.cfclerk.domain.Technique -import com.normation.cfclerk.domain.TechniqueGenerationMode._ +import com.normation.cfclerk.domain.TechniqueGenerationMode.* import com.normation.cfclerk.domain.TechniqueId import com.normation.cfclerk.domain.TechniqueVersion import com.normation.errors @@ -61,19 +61,19 @@ import com.normation.rudder.web.components.DirectiveEditForm import com.normation.rudder.web.services.AgentCompat import com.normation.rudder.web.services.DisplayDirectiveTree import com.normation.utils.DateFormaterService -import com.normation.zio._ -import net.liftweb.common._ -import net.liftweb.common.Box._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ +import com.normation.zio.* +import net.liftweb.common.* +import net.liftweb.common.Box.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* import net.liftweb.http.js.JE.JsArray -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import net.liftweb.json -import net.liftweb.util.Helpers._ +import net.liftweb.util.Helpers.* import net.liftweb.util.Helpers.TimeSpan import org.joda.time.DateTime -import scala.xml._ +import scala.xml.* final case class JsonDirectiveRId(directiveId: String, rev: Option[String]) @@ -88,7 +88,7 @@ final case class JsonDirectiveRId(directiveId: String, rev: Option[String]) * */ class DirectiveManagement extends DispatchSnippet with Loggable { - import DirectiveManagement._ + import DirectiveManagement.* private[this] val techniqueRepository = RudderConfig.techniqueRepository private[this] val getDirectiveLib = () => RudderConfig.roDirectiveRepository.getFullDirectiveLibrary() diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala index 3f59f9caea8..180dd9a1aaa 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala @@ -45,16 +45,16 @@ import com.normation.rudder.services.workflows.GlobalParamChangeRequest import com.normation.rudder.services.workflows.GlobalParamModAction import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.components.popup.CreateOrUpdateGlobalParameterPopup -import net.liftweb.common._ -import net.liftweb.http._ +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.DispatchSnippet -import net.liftweb.http.SHtml._ -import net.liftweb.http.js._ +import net.liftweb.http.SHtml.* +import net.liftweb.http.js.* import net.liftweb.http.js.JE.JsRaw -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util._ -import net.liftweb.util.Helpers._ -import scala.xml._ +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.* +import net.liftweb.util.Helpers.* +import scala.xml.* class ParameterManagement extends DispatchSnippet with Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala index ef0355d0493..11f30950866 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/AcceptNode.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.snippet.node import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.NodeId @@ -52,17 +52,17 @@ import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.ChooseTemplate import com.normation.rudder.web.components.popup.ExpectedPolicyPopup import com.normation.utils.DateFormaterService -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.json._ -import net.liftweb.util.Helpers._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.json.* +import net.liftweb.util.Helpers.* import org.joda.time.DateTime import org.springframework.security.core.context.SecurityContextHolder import org.springframework.security.core.userdetails.UserDetails -import scala.xml._ +import scala.xml.* /** * Check for server in the pending repository and propose to diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala index ad11de79664..39e0038a9b6 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Groups.scala @@ -38,31 +38,31 @@ package com.normation.rudder.web.snippet.node import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.eventlog.ModificationId import com.normation.plugins.DefaultExtendableSnippet import com.normation.rudder.AuthorizationType -import com.normation.rudder.domain.nodes._ +import com.normation.rudder.domain.nodes.* import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupCategory import com.normation.rudder.domain.nodes.NodeGroupCategoryId -import com.normation.rudder.domain.policies._ +import com.normation.rudder.domain.policies.* import com.normation.rudder.domain.workflows.ChangeRequestId -import com.normation.rudder.repository._ +import com.normation.rudder.repository.* import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.components.NodeGroupCategoryForm import com.normation.rudder.web.components.NodeGroupForm import com.normation.rudder.web.components.popup.CreateCategoryOrGroupPopup import com.normation.rudder.web.services.DisplayNodeGroupTree -import net.liftweb.common._ -import net.liftweb.http._ +import net.liftweb.common.* +import net.liftweb.http.* import net.liftweb.http.LocalSnippet -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.json._ -import net.liftweb.util._ -import scala.xml._ +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.json.* +import net.liftweb.util.* +import scala.xml.* object Groups { val htmlId_groupTree = "groupTree" @@ -78,7 +78,7 @@ object Groups { } class Groups extends StatefulSnippet with DefaultExtendableSnippet[Groups] with Loggable { - import Groups._ + import Groups.* private[this] val getFullGroupLibrary = RudderConfig.roNodeGroupRepository.getFullGroupLibrary _ private[this] val woNodeGroupRepository = RudderConfig.woNodeGroupRepository @@ -182,7 +182,7 @@ class Groups extends StatefulSnippet with DefaultExtendableSnippet[Groups] with |app.ports.createGroupModal.subscribe(function(msg) { | createGroupCallback() |}); - | + | |// We need to notify the Elm app when an action could have been executed to refresh the display |$$("#createGroupPopup").on("hidden.bs.modal", function () { | app.ports.closeModal.send(null) diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Node.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Node.scala index 7c57a950119..6c3f8823c76 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Node.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Node.scala @@ -38,10 +38,10 @@ package com.normation.rudder.web.snippet.node import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.inventory.domain.NodeId import com.normation.rudder.web.components.ShowNodeDetailsFromNode -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.S import net.liftweb.http.StatefulSnippet diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/NodeHistoryViewer.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/NodeHistoryViewer.scala index ac9145324e2..8b6c699b6a1 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/NodeHistoryViewer.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/NodeHistoryViewer.scala @@ -38,20 +38,20 @@ package com.normation.rudder.web.snippet.node import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.inventory.domain.NodeId import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.model.JsNodeId import com.normation.rudder.web.services.DisplayNode -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util.Helpers._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.Helpers.* import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat -import scala.xml._ +import scala.xml.* /** * A simple service that displays a NodeDetail widget from diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Nodes.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Nodes.scala index 5049d363aed..697c5c03788 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Nodes.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/Nodes.scala @@ -38,8 +38,8 @@ package com.normation.rudder.web.snippet.node import bootstrap.liftweb.RudderConfig -import net.liftweb.common._ -import net.liftweb.http._ +import net.liftweb.common.* +import net.liftweb.http.* import scala.xml.NodeSeq class Nodes extends StatefulSnippet with Loggable { val srvGrid = RudderConfig.srvGrid diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala index e33b2f6f10c..55870f47b1e 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala @@ -38,25 +38,25 @@ package com.normation.rudder.web.snippet.node import bootstrap.liftweb.RudderConfig -import com.normation.box._ -import com.normation.eventlog._ +import com.normation.box.* +import com.normation.eventlog.* import com.normation.inventory.domain.NodeId -import com.normation.rudder.domain.eventlog._ +import com.normation.rudder.domain.eventlog.* import com.normation.rudder.domain.eventlog.DeleteNodeEventLog import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.users.CurrentUser import com.normation.rudder.web.services.DisplayNode import com.normation.utils.DateFormaterService -import net.liftweb.common._ -import net.liftweb.http._ -import net.liftweb.http.js._ -import net.liftweb.http.js.JE._ -import net.liftweb.http.js.JsCmds._ -import net.liftweb.util._ -import net.liftweb.util.Helpers._ +import net.liftweb.common.* +import net.liftweb.http.* +import net.liftweb.http.js.* +import net.liftweb.http.js.JE.* +import net.liftweb.http.js.JsCmds.* +import net.liftweb.util.* +import net.liftweb.util.Helpers.* import org.joda.time.DateTime -import org.joda.time.format._ -import scala.xml._ +import org.joda.time.format.* +import scala.xml.* object PendingHistoryGrid extends Loggable { diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala index 61184e00a73..df7155f2832 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.snippet.node import bootstrap.liftweb.RudderConfig -import com.normation.box._ +import com.normation.box.* import com.normation.inventory.domain.NodeId import com.normation.rudder.domain.nodes.NodeGroup import com.normation.rudder.domain.nodes.NodeGroupId @@ -48,7 +48,7 @@ import com.normation.rudder.domain.policies.NonGroupRuleTarget import com.normation.rudder.domain.queries.Query import com.normation.rudder.web.components.SearchNodeComponent import com.normation.rudder.web.components.popup.CreateCategoryOrGroupPopup -import net.liftweb.common._ +import net.liftweb.common.* import net.liftweb.http.LocalSnippet import net.liftweb.http.SHtml import net.liftweb.http.SHtml.ElemAttr.pairToBasic @@ -56,7 +56,7 @@ import net.liftweb.http.StatefulSnippet import net.liftweb.http.js.JE.JsRaw import net.liftweb.http.js.JE.JsVar import net.liftweb.http.js.JsCmd -import net.liftweb.http.js.JsCmds._ +import net.liftweb.http.js.JsCmds.* import scala.xml.Elem import scala.xml.NodeSeq import scala.xml.NodeSeq.seqToNodeSeq diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/ClasspathTemplates.scala b/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/ClasspathTemplates.scala index ac1086fb607..28f524d200a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/ClasspathTemplates.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/ClasspathTemplates.scala @@ -39,10 +39,10 @@ package net.liftweb.http import java.io.InputStream import java.util.Locale -import net.liftweb.common._ -import net.liftweb.util._ +import net.liftweb.common.* +import net.liftweb.util.* import org.springframework.core.io.ClassPathResource -import scala.xml._ +import scala.xml.* /** * That class is mostly a copy&paste of net.liftweb.http.Templates, diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/LocalSnippet.scala b/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/LocalSnippet.scala index 136d5239887..16e837d045a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/LocalSnippet.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/net/liftweb/http/LocalSnippet.scala @@ -37,7 +37,7 @@ package net.liftweb.http -import net.liftweb.common._ +import net.liftweb.common.* import scala.reflect.ClassTag /** diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserDetailsTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserDetailsTest.scala index 0aa7be6759e..74ea3c10ca4 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserDetailsTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserDetailsTest.scala @@ -53,9 +53,9 @@ import com.normation.rudder.facts.nodes.NodeSecurityContext import com.normation.rudder.rest.AuthorizationApiMapping import com.normation.rudder.rest.RoleApiMapping import com.normation.rudder.tenants.TenantId -import com.normation.zio._ +import com.normation.zio.* import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import org.specs2.specification.core.Fragments import scala.annotation.nowarn @@ -150,7 +150,7 @@ class RudderUserDetailsTest extends Specification { "general rules around custom roles definition and error should be parsed correctly" >> { - import AuthorizationType._ + import AuthorizationType.* // add a plugin built-in role and check it is available too diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserPasswordEncoderTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserPasswordEncoderTest.scala index e0bd64a50b5..e4f33b1b932 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserPasswordEncoderTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/RudderUserPasswordEncoderTest.scala @@ -38,7 +38,7 @@ package bootstrap.liftweb import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner /* diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateChangeValidationEnforceSchema.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateChangeValidationEnforceSchema.scala index 87f11c10f4e..15e1ccb3923 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateChangeValidationEnforceSchema.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateChangeValidationEnforceSchema.scala @@ -42,7 +42,7 @@ import com.normation.rudder.db.Doobie import com.normation.zio.UnsafeRun import doobie.Transactor import doobie.specs2.analysisspec.IOChecker -import doobie.syntax.all._ +import doobie.syntax.all.* import doobie.util.fragment import doobie.util.fragments.and import doobie.util.fragments.whereOr @@ -52,12 +52,12 @@ import org.specs2.specification.core.Fragments import scala.util.Failure import scala.util.Success import scala.util.Try -import zio._ -import zio.interop.catz._ +import zio.* +import zio.interop.catz.* @RunWith(classOf[JUnitRunner]) class TestMigrateChangeValidationEnforceSchema extends DBCommon with IOChecker { - import TestMigrateChangeValidationEnforceSchema._ + import TestMigrateChangeValidationEnforceSchema.* private lazy val migrateChangeValidation = new MigrateChangeValidationEnforceSchemaTempTable(doobie) diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateEventLogEnforceSchema.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateEventLogEnforceSchema.scala index 4146182b203..4c4a12c2e3d 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateEventLogEnforceSchema.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateEventLogEnforceSchema.scala @@ -41,7 +41,7 @@ import com.normation.rudder.db.DBCommon import com.normation.rudder.db.Doobie import com.normation.zio.UnsafeRun import doobie.specs2.IOChecker -import doobie.syntax.all._ +import doobie.syntax.all.* import doobie.util.fragment import doobie.util.fragments.whereAnd import doobie.util.transactor.Transactor @@ -51,12 +51,12 @@ import org.specs2.specification.core.Fragments import scala.util.Failure import scala.util.Success import scala.util.Try -import zio._ -import zio.interop.catz._ +import zio.* +import zio.interop.catz.* @RunWith(classOf[JUnitRunner]) class TestMigrateEventLogEnforceSchema extends DBCommon with IOChecker { - import TestMigrateEventLogEnforceSchema._ + import TestMigrateEventLogEnforceSchema.* private lazy val migrateEventLogRepository = new MigrateEventLogEnforceSchemaTempTable(doobie) diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala index ab00aa9fe94..be7f3f8bd97 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateJsonTechniquesToYaml.scala @@ -62,13 +62,13 @@ import com.normation.rudder.repository.xml.RudderPrettyPrinter import com.normation.rudder.repository.xml.TechniqueArchiverImpl import com.normation.rudder.repository.xml.TechniqueFiles import com.normation.rudder.services.user.TrivialPersonIdentService -import com.normation.zio._ -import org.junit.runner._ +import com.normation.zio.* +import org.junit.runner.* import org.specs2.matcher.ContentMatchers -import org.specs2.mutable._ -import org.specs2.runner._ -import zio._ -import zio.syntax._ +import org.specs2.mutable.* +import org.specs2.runner.* +import zio.* +import zio.syntax.* /** * A simple test class to check that the demo data file is up to date diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala index 8f974eb2849..e353cc05c6f 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala @@ -39,7 +39,7 @@ package bootstrap.liftweb.checks.migration import better.files.File import bootstrap.liftweb.BootstrapLogger -import com.normation.errors._ +import com.normation.errors.* import com.normation.eventlog.EventActor import com.normation.inventory.domain.AcceptedInventory import com.normation.inventory.domain.NodeId @@ -64,19 +64,19 @@ import com.normation.rudder.services.nodes.history.impl.InventoryHistoryLogRepos import com.normation.rudder.services.nodes.history.impl.NodeDeleteEvent import com.normation.rudder.services.policies.NodeConfigData import com.normation.utils.DateFormaterService -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN import org.apache.commons.io.FileUtils import org.joda.time.DateTime import org.joda.time.format.DateTimeFormatter import org.joda.time.format.ISODateTimeFormat -import org.junit.runner._ +import org.junit.runner.* import org.specs2.matcher.MatchResult -import org.specs2.mutable._ -import org.specs2.runner._ +import org.specs2.mutable.* +import org.specs2.runner.* import org.specs2.specification.AfterAll -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * Check that historical inventories are correctly migrated. @@ -170,8 +170,8 @@ trait TestMigrateNodeAcceptationInventories extends Specification with AfterAll * Store migrated inventories under rootDir/migrated as a nodeid/date.json files */ object fileFactLog extends HistoryLogRepository[NodeId, DateTime, FactLogData, FactLog] with InventoryHistoryDelete { - import com.normation.rudder.facts.nodes.NodeFactSerialisation._ - import zio.json._ + import com.normation.rudder.facts.nodes.NodeFactSerialisation.* + import zio.json.* val root: File = testDir / "migrated" root.createDirectories() @@ -251,7 +251,7 @@ trait TestMigrateNodeAcceptationInventories extends Specification with AfterAll // fb0096f3-a928-454d-9776-e8079d48cdd8 => deleted, age ok // fb0096f4-a928-454d-9776-e8079d48cdd8 => deleted, too old object nodeInfoService extends NodeInfoService { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* val n = NodeConfigData.node1 def success(nodeId: NodeId): ZIO[Any, Nothing, Some[NodeInfo]] = Some(n.modify(_.node.id).setTo(nodeId)).succeed diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginJsonTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginJsonTest.scala index 9d34c28e894..7c721331f5d 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginJsonTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginJsonTest.scala @@ -39,11 +39,11 @@ package com.normation.plugins import com.normation.utils.ParseVersion import com.normation.utils.Version -import com.normation.zio._ +import com.normation.zio.* import org.joda.time.DateTime import org.joda.time.format.ISODateTimeFormat import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginTest.scala index 3de36a4a090..ec8863d3179 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/plugins/RudderPluginTest.scala @@ -40,7 +40,7 @@ package com.normation.plugins import com.normation.utils.ParseVersion import com.normation.utils.Version import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/javascript/CalculateComplianceTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/javascript/CalculateComplianceTest.scala index 2dbc50b9d37..d1c90df6f83 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/javascript/CalculateComplianceTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/javascript/CalculateComplianceTest.scala @@ -41,10 +41,10 @@ import com.normation.cfclerk.domain.Variable import com.normation.errors.RudderError import com.normation.rudder.services.policies.JsEngine import com.normation.rudder.services.policies.JsRudderLibBinding -import com.normation.zio._ +import com.normation.zio.* import org.junit.runner.RunWith import org.specs2.matcher.Matcher -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import scala.util.matching.Regex diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala index b14fd64d0a2..29ed40c8bb2 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/services/Section2FieldServiceTest.scala @@ -60,7 +60,7 @@ import com.normation.rudder.web.model.TextField import com.normation.rudder.web.model.UploadedFileField import net.liftweb.common.Full import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import org.specs2.specification.core.Fragment diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala index 32980221c3b..4113daf6c4c 100644 --- a/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala +++ b/webapp/sources/rudder/rudder-web/src/test/scala/com/normation/rudder/web/snippet/HomePageTest.scala @@ -38,7 +38,7 @@ package com.normation.rudder.web.snippet import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala index 6d987c826ee..8ba4a465697 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/ldif/LDIFFileLogger.scala @@ -23,7 +23,7 @@ package com.normation.ldap.ldif import com.normation.ldap.sdk.LDAPTree import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.Entry -import com.unboundid.ldif._ +import com.unboundid.ldif.* import java.io.File import java.util.regex.Pattern import org.slf4j.Logger diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/listener/InMemoryDsConnectionProvider.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/listener/InMemoryDsConnectionProvider.scala index 1514a1718a8..ae8541eb44e 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/listener/InMemoryDsConnectionProvider.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/listener/InMemoryDsConnectionProvider.scala @@ -20,14 +20,14 @@ package com.normation.ldap.listener -import com.normation.ldap.ldif._ -import com.normation.ldap.sdk._ +import com.normation.ldap.ldif.* +import com.normation.ldap.sdk.* import com.normation.ldap.sdk.syntax.UnboundidLDAPConnection -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.listener.InMemoryDirectoryServer import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig import com.unboundid.ldap.sdk.schema.Schema -import zio._ +import zio.* /** * A class that provides a connection provider which use an @@ -77,8 +77,8 @@ object InMemoryDsConnectionProvider { * The configuration only allows one schema file. Just concatenate them all */ - val schema = Schema.getSchema(schemaLDIFPaths: _*) - val config = new InMemoryDirectoryServerConfig(baseDNs: _*) + val schema = Schema.getSchema(schemaLDIFPaths*) + val config = new InMemoryDirectoryServerConfig(baseDNs*) config.setSchema(schema) new InMemoryDsConnectionProvider[CON](config, bootstrapLDIFPaths, ldifFileLogger) } diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/BuildFilter.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/BuildFilter.scala index e4789958256..6435cad6031 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/BuildFilter.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/BuildFilter.scala @@ -21,7 +21,7 @@ package com.normation.ldap.sdk import com.unboundid.ldap.sdk.Filter -import com.unboundid.ldap.sdk.Filter._ +import com.unboundid.ldap.sdk.Filter.* object BuildFilter { @@ -39,7 +39,7 @@ object BuildFilter { * * @return The created AND search filter. */ - def AND(andComponents: Filter*): Filter = createANDFilter(andComponents: _*) + def AND(andComponents: Filter*): Filter = createANDFilter(andComponents*) /** * Creates a new OR search filter with the provided components. @@ -49,7 +49,7 @@ object BuildFilter { * * @return The created OR search filter. */ - def OR(orComponents: Filter*): Filter = createORFilter(orComponents: _*) + def OR(orComponents: Filter*): Filter = createORFilter(orComponents*) /** * Creates a new NOT search filter with the provided component. diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala index c41443524be..510f76b168d 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnection.scala @@ -23,9 +23,9 @@ package com.normation.ldap.sdk import com.normation.NamedZioLogger import com.normation.ldap.ldif.LDIFFileLogger import com.normation.ldap.ldif.LDIFNoopChangeRecord -import com.normation.ldap.sdk.LDAPIOResult._ +import com.normation.ldap.sdk.LDAPIOResult.* import com.normation.ldap.sdk.LDAPRudderError.BackendException -import com.normation.ldap.sdk.syntax._ +import com.normation.ldap.sdk.syntax.* import com.unboundid.ldap.sdk.AddRequest import com.unboundid.ldap.sdk.DeleteRequest import com.unboundid.ldap.sdk.DN @@ -38,12 +38,12 @@ import com.unboundid.ldap.sdk.ModifyRequest import com.unboundid.ldap.sdk.RDN import com.unboundid.ldap.sdk.ReadOnlyLDAPRequest import com.unboundid.ldap.sdk.ResultCode -import com.unboundid.ldap.sdk.ResultCode._ +import com.unboundid.ldap.sdk.ResultCode.* import com.unboundid.ldap.sdk.SearchRequest import com.unboundid.ldif.LDIFChangeRecord -import scala.jdk.CollectionConverters._ -import zio._ -import zio.syntax._ +import scala.jdk.CollectionConverters.* +import zio.* +import zio.syntax.* /* * Logger for LDAP connection related information. @@ -95,7 +95,7 @@ trait ReadOnlyEntryLDAPConnection { * The sequence of entries matching search request parameters. */ def search(baseDn: DN, scope: SearchScope, filter: Filter, attributes: String*): LDAPIOResult[Seq[LDAPEntry]] = { - search(new SearchRequest(baseDn.toString, scope.toUnboundid, filter, attributes: _*)) + search(new SearchRequest(baseDn.toString, scope.toUnboundid, filter, attributes*)) } /** @@ -122,7 +122,7 @@ trait ReadOnlyEntryLDAPConnection { * Empty otherwise */ def get(baseDn: DN, filter: Filter, attributes: String*): LDAPIOResult[Option[LDAPEntry]] = { - searchOne(baseDn, filter, attributes: _*).map { + searchOne(baseDn, filter, attributes*).map { case buf if (buf.isEmpty) => None case buf => Some(buf(0)) } @@ -156,7 +156,7 @@ trait ReadOnlyEntryLDAPConnection { * The sequence of entries matching search request parameters. */ def searchOne(baseDn: DN, filter: Filter, attributes: String*): LDAPIOResult[Seq[LDAPEntry]] = - search(baseDn, One, filter, attributes: _*) + search(baseDn, One, filter, attributes*) /** * Search method restricted to scope = SubTree @@ -173,7 +173,7 @@ trait ReadOnlyEntryLDAPConnection { * The sequence of entries matching search request parameters. */ def searchSub(baseDn: DN, filter: Filter, attributes: String*): LDAPIOResult[Seq[LDAPEntry]] = - search(baseDn, Sub, filter, attributes: _*) + search(baseDn, Sub, filter, attributes*) } trait WriteOnlyEntryLDAPConnection { @@ -297,7 +297,7 @@ trait UnboundidBackendLDAPConnection { } object RoLDAPConnection { - import ResultCode._ + import ResultCode.* /** * Default error on which we don't want to throw an exception @@ -345,7 +345,7 @@ sealed class RoLDAPConnection( blocking { val e = { if (attributes.isEmpty) backed.getEntry(dn.toString) - else backed.getEntry(dn.toString, attributes: _*) + else backed.getEntry(dn.toString, attributes*) } e match { case null => None @@ -373,7 +373,7 @@ sealed class RoLDAPConnection( override def getTreeFilter(dn: DN, filter: Filter, attributes: String*): LDAPIOResult[Option[LDAPTree]] = { blocking { - backed.search(dn.toString, Sub.toUnboundid, filter, attributes: _*) + backed.search(dn.toString, Sub.toUnboundid, filter, attributes*) } flatMap { all => if (all.getEntryCount() > 0) { // build the tree @@ -392,7 +392,7 @@ sealed class RoLDAPConnection( } object RwLDAPConnection { - import ResultCode._ + import ResultCode.* /** * Default error on which we don't want to throw an exception @@ -626,7 +626,7 @@ class RwLDAPConnection( * the error in other case. */ override def modify(dn: DN, modifications: Modification*): LDAPIOResult[LDIFChangeRecord] = { - applyModify(new ModifyRequest(dn.toString, modifications: _*)) + applyModify(new ModifyRequest(dn.toString, modifications*)) } override def move(dn: DN, newParentDn: DN, newRDN: Option[RDN] = None): LDAPIOResult[LDIFChangeRecord] = { @@ -662,7 +662,7 @@ class RwLDAPConnection( } } synchronized { - get(entry.dn, attributes: _*) flatMap { // TODO if removeMissing is false, only get attribute in entry (we don't care of others) + get(entry.dn, attributes*) flatMap { // TODO if removeMissing is false, only get attribute in entry (we don't care of others) case None => applyAdd(new AddRequest(entry.backed)) case Some(existing) => diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala index 7ecd7077c53..a1568493707 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPConnectionProvider.scala @@ -20,18 +20,18 @@ package com.normation.ldap.sdk -import com.normation.errors._ +import com.normation.errors.* import com.normation.ldap.ldif.DefaultLDIFFileLogger import com.normation.ldap.ldif.LDIFFileLogger -import com.normation.ldap.sdk.LDAPIOResult._ -import com.normation.ldap.sdk.syntax._ +import com.normation.ldap.sdk.LDAPIOResult.* +import com.normation.ldap.sdk.syntax.* import com.normation.zio.ZioRuntime import com.unboundid.ldap.sdk.LDAPConnection import com.unboundid.ldap.sdk.LDAPConnectionOptions import com.unboundid.ldap.sdk.LDAPConnectionPool import com.unboundid.ldap.sdk.LDAPException -import zio._ -import zio.syntax._ +import zio.* +import zio.syntax.* /** * A LDAP connection manager. diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala index 6274ec921a8..3f13a2d6043 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPEntry.scala @@ -20,7 +20,7 @@ package com.normation.ldap.sdk -import com.normation.ldap.sdk.syntax._ +import com.normation.ldap.sdk.syntax.* import com.unboundid.ldap.sdk.Attribute import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.DN.NULL_DN @@ -31,7 +31,7 @@ import com.unboundid.ldif.LDIFRecord import org.slf4j.Logger import org.slf4j.LoggerFactory import scala.collection.mutable.Buffer -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.* import zio.Chunk /** @@ -68,7 +68,7 @@ import zio.Chunk class LDAPEntry(private val _backed: UnboundidEntry) { // copy constructor, needed for special case, when mixing LDAPEntry with other types - def this(e: LDAPEntry) = this(new UnboundidEntry(e._backed.getParsedDN, e._backed.getAttributes.asScala.toSeq: _*)) + def this(e: LDAPEntry) = this(new UnboundidEntry(e._backed.getParsedDN, e._backed.getAttributes.asScala.toSeq*)) // define a read only view of the backed entry, usefull in ldap connection to not have to override everything defined by Unboundid def backed = new com.unboundid.ldap.sdk.ReadOnlyEntry(_backed) @@ -81,7 +81,7 @@ class LDAPEntry(private val _backed: UnboundidEntry) { private val _parentDn: Option[DN] = listRdns match { case r :: Nil => None - case r :: p => Some(new DN(p.toSeq: _*)) + case r :: p => Some(new DN(p.toSeq*)) case _ => None } @@ -295,8 +295,8 @@ object LDAPEntry { val logger: Logger = LoggerFactory.getLogger(classOf[LDAPEntry]) def apply(e: UnboundidEntry): LDAPEntry = new LDAPEntry(e.duplicate()) // val e = LDAPEntry(unboundidEntry) - def apply(dn: DN, attributes: Attribute*): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes: _*)) - def apply(dn: DN, attributes: Iterable[Attribute]): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes.toSeq: _*)) + def apply(dn: DN, attributes: Attribute*): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes*)) + def apply(dn: DN, attributes: Iterable[Attribute]): LDAPEntry = LDAPEntry(new UnboundidEntry(dn, attributes.toSeq*)) def apply(rdnAttribute: String, rdnValue: String, parentDn: String, attributes: Attribute*): LDAPEntry = { require(rdnValue != null && rdnValue.nonEmpty) apply(new DN(s"${rdnAttribute}=${rdnValue},${parentDn}"), attributes) @@ -341,7 +341,7 @@ object LDAPEntry { targetEntry.backed.getParsedDN, targetEntry.backed.getAttributes.asScala.map { a => if (ignoreCaseOnAttributes.contains(a.getName)) a - else new Attribute(a.getName, rule, a.getValues: _*) + else new Attribute(a.getName, rule, a.getValues*) } ) @@ -350,7 +350,7 @@ object LDAPEntry { sourceEntry.backed.getParsedDN, sourceEntry.backed.getAttributes.asScala.map { a => if (ignoreCaseOnAttributes.contains(a.getName)) a - else new Attribute(a.getName, rule, a.getValues: _*) + else new Attribute(a.getName, rule, a.getValues*) } ) @@ -377,7 +377,7 @@ object LDAPEntry { target.backed, true, false, - attrs.toSeq: _* + attrs.toSeq* ) // false: use replace in LDIF } } else { // only compare attributes in e @@ -386,13 +386,13 @@ object LDAPEntry { target.backed, true, false, - targetEntry.attributes.toSeq.map(_.getName): _* + targetEntry.attributes.toSeq.map(_.getName)* ) } mods }.asScala def diff(sourceEntry: LDAPEntry, targetEntry: LDAPEntry, onlyAttributes: Seq[String]): Buffer[Modification] = { - com.unboundid.ldap.sdk.Entry.diff(sourceEntry.backed, targetEntry.backed, true, false, onlyAttributes: _*).asScala + com.unboundid.ldap.sdk.Entry.diff(sourceEntry.backed, targetEntry.backed, true, false, onlyAttributes*).asScala } } diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPIOResult.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPIOResult.scala index 4bd12bd6a1e..0bd45fda527 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPIOResult.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPIOResult.scala @@ -23,9 +23,9 @@ package com.normation.ldap.sdk import cats.data.NonEmptyList import com.normation.errors.IOResult import com.normation.errors.RudderError -import com.normation.ldap.sdk.syntax._ -import zio._ -import zio.syntax._ +import com.normation.ldap.sdk.syntax.* +import zio.* +import zio.syntax.* sealed trait LDAPRudderError extends RudderError { def msg: String diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPTree.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPTree.scala index ff3cabef0cf..5bf40098350 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPTree.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/LDAPTree.scala @@ -20,10 +20,10 @@ package com.normation.ldap.sdk -import cats.implicits._ +import cats.implicits.* import com.normation.ldap.ldif.ToLDIFRecords import com.normation.ldap.ldif.ToLDIFString -import com.normation.ldap.sdk.LDAPIOResult._ +import com.normation.ldap.sdk.LDAPIOResult.* import com.normation.ldap.sdk.LDAPRudderError.Consistancy import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.RDN @@ -31,7 +31,7 @@ import com.unboundid.ldif.LDIFRecord import org.slf4j.Logger import scala.collection.mutable.Buffer import scala.collection.mutable.HashMap -import zio.syntax._ +import zio.syntax.* /* * An LDAP tree of entries. @@ -121,7 +121,7 @@ object LDAPTree { def move(tree: LDAPTree, newRdn: Option[RDN], newParentDn: Option[DN]): LDAPTree = { val rdn = newRdn.orElse(tree.root.rdn) val parentDn = newParentDn.orElse(tree.root.parentDn) - val newRoot = LDAPEntry(rdn, parentDn, tree.root.attributes.toSeq: _*) + val newRoot = LDAPEntry(rdn, parentDn, tree.root.attributes.toSeq*) apply(newRoot, tree._children.map(kv => (kv._1, LDAPTree.move(kv._2, None, newRoot.optDn)))) } diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/schema/LDAPSchema.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/schema/LDAPSchema.scala index 79034debc3d..afaf1a3361c 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/schema/LDAPSchema.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/schema/LDAPSchema.scala @@ -31,7 +31,7 @@ package com.normation.ldap.sdk.schema */ class LDAPSchema { type S = scala.collection.immutable.Set[LDAPObjectClass] - import scala.collection.mutable.{Map => MutMap} + import scala.collection.mutable.Map as MutMap def S: Seq[LDAPObjectClass] => Set[LDAPObjectClass] = scala.collection.immutable.Set[LDAPObjectClass] _ /** @@ -120,7 +120,7 @@ class LDAPSchema { def objectClassNames(objectClass: String): List[String] = apply(objectClass).name :: parents(objectClass) def objectClasses(objectClass: String): LDAPObjectClasses = - LDAPObjectClasses(this.objectClassNames(objectClass).map(apply(_)): _*) + LDAPObjectClasses(this.objectClassNames(objectClass).map(apply(_))*) /** * Given a set of object classes which are ALL registered, diff --git a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/syntax.scala b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/syntax.scala index 8eadc72a19b..a95977fe7fb 100644 --- a/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/syntax.scala +++ b/webapp/sources/scala-ldap/src/main/scala/com/normation/ldap/sdk/syntax.scala @@ -21,10 +21,10 @@ package com.normation.ldap.sdk import com.unboundid.ldap.sdk -import com.unboundid.ldap.sdk.{Entry => UEntry} -import com.unboundid.ldap.sdk.{LDAPConnection => ULDAPConnection} -import com.unboundid.ldap.sdk.{LDAPResult => ULDAPResult} import com.unboundid.ldap.sdk.DN +import com.unboundid.ldap.sdk.Entry as UEntry +import com.unboundid.ldap.sdk.LDAPConnection as ULDAPConnection +import com.unboundid.ldap.sdk.LDAPResult as ULDAPResult object syntax { @@ -40,7 +40,7 @@ object syntax { implicit class SearchScopeTonbound(s: SearchScope) { def toUnboundid: sdk.SearchScope = { - import com.unboundid.ldap.sdk.SearchScope._ + import com.unboundid.ldap.sdk.SearchScope.* s match { case One => ONE case Base => BASE diff --git a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala index 6f66ce6adf7..c462a9fdc82 100644 --- a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala +++ b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LDAPTreeTest.scala @@ -20,12 +20,12 @@ package com.normation.ldap.sdk -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN import com.unboundid.ldap.sdk.DN.NULL_DN import com.unboundid.ldap.sdk.RDN import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import scala.annotation.nowarn diff --git a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LoadDemoDataTest.scala b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LoadDemoDataTest.scala index 49fb7bb545e..28856dd0d16 100644 --- a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LoadDemoDataTest.scala +++ b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/LoadDemoDataTest.scala @@ -38,11 +38,11 @@ package com.normation.ldap.sdk import com.normation.ldap.listener.InMemoryDsConnectionProvider -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* /** * A simple test class to check that the demo data file is up to date @@ -105,7 +105,7 @@ class LoadDemoDataTest extends Specification { * 'biosName=bios1,machineId=machine2,ou=Machines,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration' because the parent for the new DN * 'biosName=bios1,machineId=machine-does-not-exists,ou=Machines,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration' does not exist. */ - res must beAnInstanceOf[Left[LDAPRudderError, _]] and ( + res must beAnInstanceOf[Left[LDAPRudderError, ?]] and ( ldap.newConnection.flatMap(_.exists(dn)).runNow must beTrue ) @@ -119,7 +119,7 @@ class LoadDemoDataTest extends Specification { val res = ldap.newConnection.flatMap(_.save(entry)).either.runNow - res must beAnInstanceOf[Left[LDAPRudderError, _]] + res must beAnInstanceOf[Left[LDAPRudderError, ?]] } } } diff --git a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/schema/SchemaTest.scala b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/schema/SchemaTest.scala index 06a224dbad5..1166b033097 100644 --- a/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/schema/SchemaTest.scala +++ b/webapp/sources/scala-ldap/src/test/scala/com/normation/ldap/sdk/schema/SchemaTest.scala @@ -22,7 +22,7 @@ package com.normation.ldap.sdk package schema import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner @RunWith(classOf[JUnitRunner]) diff --git a/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala b/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala index 25d163c01e1..bff136c8b74 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala @@ -24,11 +24,11 @@ package com.normation -import _root_.zio._ -import _root_.zio.stream._ -import _root_.zio.syntax._ -import cats.data._ -import cats.implicits._ +import _root_.zio.* +import _root_.zio.stream.* +import _root_.zio.syntax.* +import cats.data.* +import cats.implicits.* import cats.kernel.Order import com.normation.errors.Chained import com.normation.errors.IOResult @@ -37,7 +37,7 @@ import com.normation.errors.RudderError import com.normation.errors.SystemError import com.normation.errors.effectUioUnit import java.util.concurrent.TimeUnit -import net.liftweb.common.{Logger => _, _} +import net.liftweb.common.{Logger as _, *} import org.slf4j.Logger /** @@ -270,7 +270,7 @@ object errors { private def toNEL[E, B](tuple: (Iterable[E], Iterable[B])): ZIO[Any, NonEmptyList[E], List[B]] = { (tuple._1.toList, tuple._2.toList) match { - case ((h :: t), _) => NonEmptyList.of(h, t: _*).fail + case ((h :: t), _) => NonEmptyList.of(h, t*).fail case (Nil, res) => res.succeed } } @@ -329,7 +329,7 @@ object errors { case Right(res) => Right(res) } def accumulateEitherDiscard: PureResult[Unit] = in.collect { case Left(e) => e }.toList match { - case err :: t => Left(Accumulated(NonEmptyList.of(err, t: _*))) + case err :: t => Left(Accumulated(NonEmptyList.of(err, t*))) case Nil => Right(()) } } @@ -366,7 +366,7 @@ object errors { } implicit class BoxToEither[E <: RudderError, A](val res: Box[A]) extends AnyVal { - import cats.instances.either._ + import cats.instances.either.* def toPureResult: PureResult[A] = BoxUtil.fold[E, A, PureResult]( err => Left(err), suc => Right(suc) @@ -374,7 +374,7 @@ object errors { } implicit class BoxToIO[E <: RudderError, A](res: => Box[A]) { - import _root_.zio.interop.catz._ + import _root_.zio.interop.catz.* def toIO: IOResult[A] = IOResult .attempt(res) .flatMap(x => { @@ -397,7 +397,7 @@ object zio { * Default ZIO Runtime used everywhere. */ object ZioRuntime { - import _root_.zio.internal._ + import _root_.zio.internal.* /* * Create a signal handler for signal USR2 that dumps Fibers on log. Can be @@ -595,14 +595,14 @@ object json { * costly. Avoid translation if possible. */ - import _root_.zio.json._ - import _root_.zio.json.ast._ - import _root_.zio.json.ast.Json._ - import net.liftweb.json._ + import _root_.zio.json.* + import _root_.zio.json.ast.* + import _root_.zio.json.ast.Json.* + import net.liftweb.json.* def zioToLift(json: Json): JValue = { json match { - case Json.Obj(fields) => JObject(fields.map { case (k, j) => JField(k, zioToLift(j)) }: _*) + case Json.Obj(fields) => JObject(fields.map { case (k, j) => JField(k, zioToLift(j)) }*) case Json.Arr(elements) => JArray(elements.map(zioToLift(_)).toList) case Json.Bool(value) => JBool(value) case Json.Str(value) => JString(value) @@ -624,8 +624,8 @@ object json { case JsonAST.JDouble(num) => Num(num) case JsonAST.JInt(num) => Num(BigDecimal(num)) case JsonAST.JBool(value) => Bool(value) - case JsonAST.JObject(obj) => Obj(obj.map(jf => (jf.name, liftToZio(jf.value))): _*) - case JsonAST.JArray(arr) => Arr(arr.map(v => liftToZio(v)): _*) + case JsonAST.JObject(obj) => Obj(obj.map(jf => (jf.name, liftToZio(jf.value)))*) + case JsonAST.JArray(arr) => Arr(arr.map(v => liftToZio(v))*) } } 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 index be5a4fef92e..d34662f3a97 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/Control.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/Control.scala @@ -21,7 +21,7 @@ package com.normation.utils import cats.Applicative -import net.liftweb.common._ +import net.liftweb.common.* /** * @@ -30,7 +30,7 @@ import net.liftweb.common._ */ object Control { - import cats.syntax.traverse._ + import cats.syntax.traverse.* implicit private val boxApplicative: Applicative[Box] = new Applicative[Box] { override def pure[A](x: A): Box[A] = Full(x) diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala index e15d1a17f59..80f06421d49 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/CronParser.scala @@ -5,7 +5,7 @@ import com.normation.errors.PureResult import com.normation.errors.SystemError import cron4s.Cron import cron4s.CronExpr -import cron4s.lib.javatime._ +import cron4s.lib.javatime.* import cron4s.toDateTimeCronOps import java.time.OffsetDateTime import zio.Schedule diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala index 24710533018..ac3b4e708fa 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/DateFormaterService.scala @@ -49,7 +49,7 @@ import org.joda.time.format.DateTimeFormatterBuilder import org.joda.time.format.ISODateTimeFormat import org.joda.time.format.PeriodFormatterBuilder import scala.util.control.NonFatal -import zio.json._ +import zio.json.* object DateFormaterService { diff --git a/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala b/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala index ea41da5ef9e..37829f51008 100644 --- a/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala +++ b/webapp/sources/utils/src/main/scala/com/normation/utils/Version.scala @@ -193,8 +193,8 @@ object VersionPart { } object ParseVersion { - import fastparse._ - import fastparse.NoWhitespace._ + import fastparse.* + import fastparse.NoWhitespace.* def ascii: CharsetEncoder = Charset.forName("US-ASCII").newEncoder() // chars allowed in a version. Only ascii, non control, non space, non separator - including ":" used for epoch @@ -204,7 +204,7 @@ object ParseVersion { def num[A: P]: P[Long] = P(CharIn("0-9").rep(1).!.map(_.toLong)) def chars[A: P]: P[PartType] = P(CharsWhile(versionChar).rep(1).!).map { s => - import PartType._ + import PartType.* s.toLowerCase match { case "snapshot" => Snapshot(s) case "nightly" => Nightly(s) diff --git a/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala b/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala index dacb9e0ca86..3d6cdeca6b7 100644 --- a/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala +++ b/webapp/sources/utils/src/test/scala/com/normation/ZioCommonsTest.scala @@ -24,16 +24,16 @@ package com.normation -import _root_.zio._ -import _root_.zio.syntax._ -import com.normation.errors._ +import _root_.zio.* +import _root_.zio.syntax.* +import com.normation.errors.* import com.normation.errors.IOResult import com.normation.errors.RudderError -import com.normation.zio._ +import com.normation.zio.* import com.normation.zio.ZioRuntime -import net.liftweb.common._ +import net.liftweb.common.* import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner import scala.annotation.nowarn @@ -72,11 +72,11 @@ class ZioCommonsTest extends Specification { } object TestImplicits { - import _root_.zio._ - import _root_.zio.syntax._ + import _root_.zio.* + import _root_.zio.syntax.* object module1 { - import com.normation.errors._ + import com.normation.errors.* sealed trait M_1_Error extends RudderError object M_1_Error { final case class Some(msg: String) extends M_1_Error @@ -91,7 +91,7 @@ object TestImplicits { } object module2 { - import com.normation.errors._ + import com.normation.errors.* sealed trait M_2_Error extends RudderError object M_2_Error { final case class Some(msg: String) extends M_2_Error @@ -107,9 +107,9 @@ object TestImplicits { } object testModule { - import com.normation.errors._ - import module1._ - import module2._ + import com.normation.errors.* + import module1.* + import module2.* sealed trait M_3_Error extends RudderError object M_3_Error { final case class Some(msg: String) extends M_3_Error @@ -407,7 +407,7 @@ Process finished with exit code 0 * Testing accumulation */ object TestAccumulate { - import cats.implicits._ + import cats.implicits.* def main(args: Array[String]): Unit = { diff --git a/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala b/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala index 451f97e5c90..9c3a39b87e4 100644 --- a/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala +++ b/webapp/sources/utils/src/test/scala/com/normation/utils/TestControl.scala @@ -21,8 +21,8 @@ package com.normation.utils import Control.traverse -import net.liftweb.common._ -import org.junit._ +import net.liftweb.common.* +import org.junit.* import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner diff --git a/webapp/sources/utils/src/test/scala/com/normation/utils/TestStandardFieldValidation.scala b/webapp/sources/utils/src/test/scala/com/normation/utils/TestStandardFieldValidation.scala index 256608cd6bf..38a6d9700d1 100644 --- a/webapp/sources/utils/src/test/scala/com/normation/utils/TestStandardFieldValidation.scala +++ b/webapp/sources/utils/src/test/scala/com/normation/utils/TestStandardFieldValidation.scala @@ -20,9 +20,9 @@ package com.normation.utils -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class TestStandardFieldValidation extends Specification { diff --git a/webapp/sources/utils/src/test/scala/com/normation/utils/TestUtils.scala b/webapp/sources/utils/src/test/scala/com/normation/utils/TestUtils.scala index 9b313fe2369..0561e347755 100644 --- a/webapp/sources/utils/src/test/scala/com/normation/utils/TestUtils.scala +++ b/webapp/sources/utils/src/test/scala/com/normation/utils/TestUtils.scala @@ -20,8 +20,8 @@ package com.normation.utils -import Utils._ -import org.junit._ +import Utils.* +import org.junit.* import org.junit.runner.RunWith import org.junit.runners.BlockJUnit4ClassRunner diff --git a/webapp/sources/utils/src/test/scala/com/normation/utils/VersionTest.scala b/webapp/sources/utils/src/test/scala/com/normation/utils/VersionTest.scala index d8a46991c0e..aa120a54f12 100644 --- a/webapp/sources/utils/src/test/scala/com/normation/utils/VersionTest.scala +++ b/webapp/sources/utils/src/test/scala/com/normation/utils/VersionTest.scala @@ -37,9 +37,9 @@ package com.normation.utils -import org.junit.runner._ -import org.specs2.mutable._ -import org.specs2.runner._ +import org.junit.runner.* +import org.specs2.mutable.* +import org.specs2.runner.* @RunWith(classOf[JUnitRunner]) class VersionTest extends Specification { @@ -54,9 +54,9 @@ class VersionTest extends Specification { sequential "parse version" >> { - import PartType._ - import Separator._ - import VersionPart._ + import PartType.* + import Separator.* + import VersionPart.* def parse(s: String) = ParseVersion.parse(s).getOrElse(throw new RuntimeException(s"Can not parse: ${s}")) parse("1.0") === com.normation.utils.Version(0, Numeric(1), After(Dot, Numeric(0)) :: Nil) diff --git a/webapp/sources/utils/src/test/scala/zio/yaml/ZioYamlTest.scala b/webapp/sources/utils/src/test/scala/zio/yaml/ZioYamlTest.scala index e355f9be618..5be613d8eb0 100644 --- a/webapp/sources/utils/src/test/scala/zio/yaml/ZioYamlTest.scala +++ b/webapp/sources/utils/src/test/scala/zio/yaml/ZioYamlTest.scala @@ -25,10 +25,10 @@ package zio.yaml import org.junit.runner.RunWith -import org.specs2.mutable._ +import org.specs2.mutable.* import org.specs2.runner.JUnitRunner -import zio.json._ -import zio.json.yaml._ +import zio.json.* +import zio.json.yaml.* // test data final case class Param(id: String, mandatory: Boolean) From 86e89323aa356ad90244288b575738e67ee3dcc3 Mon Sep 17 00:00:00 2001 From: Matthieu Baechler Date: Tue, 13 Feb 2024 14:04:59 +0100 Subject: [PATCH 5/6] Add a formatting exception to prevent rewriting to an invalid expression --- .../marshalling/XmlUnserialisationImpl.scala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala index 24921684cda..5c1bcb300ef 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala @@ -270,7 +270,9 @@ class NodeGroupUnserialisationImpl( tryo(s.text.toBoolean) ) ?~! ("Missing attribute 'isSystem' in entry type nodeGroup : " + entry) properties <- traverse((group \ "properties" \ "property").toList) { + // format: off case {p @ _*} => + // format: on val name = (p \\ "name").text.trim if (name.trim.isEmpty) { Failure(s"Found unexpected xml under tag (name is blank): ${p}") @@ -287,7 +289,7 @@ class NodeGroupUnserialisationImpl( ) .toBox } - case xml => Failure(s"Found unexpected xml under tag: ${xml}") + case xml => Failure(s"Found unexpected xml under tag: ${xml}") } } yield { NodeGroup( @@ -848,14 +850,16 @@ class ApiAccountUnserialisationImpl extends ApiAccountUnserialisation { // because the event was saved < Rudder 4.3. Use a "nil" ACL Full(ApiAuthorization.None) - case Some(Text(ApiAuthorizationKind.RO.name)) => + case Some(Text(ApiAuthorizationKind.RO.name)) => Full(ApiAuthorization.RO) - case Some(Text(ApiAuthorizationKind.RW.name)) => + case Some(Text(ApiAuthorizationKind.RW.name)) => Full(ApiAuthorization.RW) + // format: off case Some({xml @ _*}) if (xml.nonEmpty) => + // format: on unserAcl(xml.head) // all other case: serialization pb => None - case _ => Full(ApiAuthorization.None) + case _ => Full(ApiAuthorization.None) } accountType = (apiAccount \ "kind").headOption.map(_.text) match { case None => ApiAccountType.PublicApi From 5f75c3aab76c3a950d3f74c64c5b45ff335e1a02 Mon Sep 17 00:00:00 2001 From: "Francois @fanf42 Armand" Date: Sun, 10 Mar 2024 17:58:45 +0100 Subject: [PATCH 6/6] Linter --- .../com/normation/rudder/api/DataStructures.scala | 2 +- .../rudder/facts/nodes/NodeFactRepository.scala | 8 ++++---- .../normation/rudder/tenants/TenantService.scala | 12 ++++++------ .../com/normation/rudder/tenants/Tenants.scala | 2 +- .../rudder/facts/nodes/MockLdapFactStorage.scala | 2 +- .../policies/TestWriteNodeCertificatesPem.scala | 2 +- .../com/normation/appconfig/ConfigService.scala | 8 ++++---- .../normation/rudder/rest/lift/ComplianceApi.scala | 14 +++++++------- .../com/normation/rudder/rest/lift/GroupsApi.scala | 2 +- .../com/normation/rudder/rest/lift/NodeApi.scala | 1 - .../scala/com/normation/rudder/MockServices.scala | 12 ++++++------ .../com/normation/rudder/rest/RestTestSetUp.scala | 2 +- .../scala/bootstrap/liftweb/AppConfigAuth.scala | 3 +-- .../src/main/scala/bootstrap/liftweb/Boot.scala | 4 ++-- 14 files changed, 36 insertions(+), 38 deletions(-) diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala index 06b52f9078f..9b6a10b8348 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/DataStructures.scala @@ -167,7 +167,7 @@ object AclPathSegment { * */ sealed trait AclPath extends Any { - def value: String = parts.toList.map(_.value).mkString("/") + def value: String = parts.toList.map(_.value).mkString("/") def parts: NonEmptyList[AclPathSegment] def display: String } diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala index a3295a9fe20..03aaf75f386 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala @@ -530,7 +530,7 @@ class CoreNodeFactRepository( } private def deleteOn(ref: Ref[Map[NodeId, CoreNodeFact]], nodeId: NodeId)(implicit - cc: ChangeContext + cc: ChangeContext ): IOResult[StorageChangeEventDelete] = { tenantService .getTenants() @@ -609,7 +609,7 @@ class CoreNodeFactRepository( * In the first case, we use the existing coreNodeFact for save. */ private def internalSave( - node: Either[NodeFact, (NodeId, Option[SecurityTag])] + node: Either[NodeFact, (NodeId, Option[SecurityTag])] )(implicit cc: ChangeContext, attrs: SelectFacts): IOResult[NodeFactChangeEventCC] = { ZIO.scoped( for { @@ -666,13 +666,13 @@ class CoreNodeFactRepository( } override def setSecurityTag(nodeId: NodeId, tag: Option[SecurityTag])(implicit - cc: ChangeContext + cc: ChangeContext ): IOResult[NodeFactChangeEventCC] = { internalSave(Right((nodeId, tag)))(cc, SelectFacts.none) } override def save( - nodeFact: NodeFact + nodeFact: NodeFact )(implicit cc: ChangeContext, attrs: SelectFacts = SelectFacts.all): IOResult[NodeFactChangeEventCC] = { checkRootProperties(nodeFact) *> checkAgentKey(nodeFact) *> diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/TenantService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/TenantService.scala index 98cb42e261d..9f378be8e0d 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/TenantService.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/TenantService.scala @@ -49,9 +49,9 @@ import com.normation.rudder.facts.nodes.MinimalNodeFactInterface import com.normation.rudder.facts.nodes.NodeFact import com.normation.rudder.facts.nodes.QueryContext import scala.collection.MapView -import zio._ +import zio.* import zio.stream.ZStream -import zio.syntax._ +import zio.syntax.* /* * This interface provide the main entry point for other part of Rudder to know @@ -83,7 +83,7 @@ trait TenantService { * Get the node with ID if it exists on ref map and qc/tenants allows to get it */ def nodeGetMapView(nodes: Ref[Map[NodeId, CoreNodeFact]], nodeId: NodeId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Option[CoreNodeFact]] /* @@ -150,7 +150,7 @@ class DefaultTenantService(private var _tenantsEnabled: Boolean, val tenantIds: } override def nodeFilterMapView( - nodes: Ref[Map[NodeId, CoreNodeFact]] + nodes: Ref[Map[NodeId, CoreNodeFact]] )(implicit qc: QueryContext): IOResult[MapView[NodeId, CoreNodeFact]] = { if (qc.nodePerms.isNone) { MapView().succeed @@ -173,7 +173,7 @@ class DefaultTenantService(private var _tenantsEnabled: Boolean, val tenantIds: } override def nodeGetMapView(nodes: Ref[Map[NodeId, CoreNodeFact]], nodeId: NodeId)(implicit - qc: QueryContext + qc: QueryContext ): IOResult[Option[CoreNodeFact]] = { if (qc.nodePerms.isNone) None.succeed else { @@ -230,7 +230,7 @@ class DefaultTenantService(private var _tenantsEnabled: Boolean, val tenantIds: } } } else { - import com.softwaremill.quicklens._ + import com.softwaremill.quicklens.* updated.modify(_.rudderSettings.security).setTo(existing.rudderSettings.security).succeed } } else { diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/Tenants.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/Tenants.scala index 751f0011c99..36b112491ec 100644 --- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/Tenants.scala +++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/tenants/Tenants.scala @@ -38,7 +38,7 @@ package com.normation.rudder.tenants import scala.util.matching.Regex -import zio.json._ +import zio.json.* /* * A node can belong to one (or technically more, but we will limit that for now) `tenant`. diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala index f5b47b1e4b5..e9f76585fd4 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala @@ -55,7 +55,7 @@ import com.normation.rudder.domain.RudderDit import com.normation.rudder.repository.ldap.LDAPEntityMapper import com.normation.rudder.repository.ldap.ZioTReentrantLock import com.normation.utils.StringUuidGeneratorImpl -import com.normation.zio._ +import com.normation.zio.* import com.unboundid.ldap.sdk.DN import zio.Ref diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala index f6e1d56fd57..53dbcac3d87 100644 --- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala +++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala @@ -53,7 +53,7 @@ import org.junit.runner.RunWith import org.slf4j.LoggerFactory import org.specs2.mutable.Specification import org.specs2.runner.JUnitRunner -import zio._ +import zio.* @RunWith(classOf[JUnitRunner]) class TestWriteNodeCertificatesPem extends Specification { diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala index bb59d3789db..d1e082f2187 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/appconfig/ConfigService.scala @@ -566,20 +566,20 @@ class GenericConfigService( def set_rudder_ui_changeMessage_explanation(value: String): IOResult[Unit] = save("rudder_ui_changeMessage_explanation", value) ///// workflows ///// - def rudder_workflow_enabled(): IOResult[Boolean] = { + def rudder_workflow_enabled(): IOResult[Boolean] = { if (workflowLevel.workflowLevelAllowsEnable) { get("rudder_workflow_enabled") } else { false.succeed } } - def rudder_workflow_self_validation(): IOResult[Boolean] = get("rudder_workflow_self_validation") - def rudder_workflow_self_deployment(): IOResult[Boolean] = get("rudder_workflow_self_deployment") + def rudder_workflow_self_validation(): IOResult[Boolean] = get("rudder_workflow_self_validation") + def rudder_workflow_self_deployment(): IOResult[Boolean] = get("rudder_workflow_self_deployment") def rudder_workflow_validate_all(): IOResult[Boolean] = get("rudder_workflow_validate_all") def set_rudder_workflow_validate_all(value: Boolean): IOResult[Unit] = save("rudder_workflow_validate_all", value).unit - def set_rudder_workflow_enabled(value: Boolean): IOResult[Unit] = { + def set_rudder_workflow_enabled(value: Boolean): IOResult[Unit] = { if (workflowLevel.workflowLevelAllowsEnable) { save("rudder_workflow_enabled", value) <* IOResult.attempt(workflowUpdate ! WorkflowUpdate) diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala index aa6805cdf64..ba78ec1900a 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala @@ -880,13 +880,13 @@ class ComplianceAPIService( nodeGroupComplianceId: String, nodeGroupName: String, serverList: Set[NodeId], - allDirectives: Map[DirectiveId, (FullActiveTechnique, Directive)], - nodeFacts: MapView[NodeId, CoreNodeFact], - nodeSettings: Map[NodeId, RudderSettings], - rules: Seq[Rule], - allRuleInfos: Map[RuleId, (Chunk[NodeId], Option[PolicyMode])], - level: Option[Int], - isGlobalCompliance: Boolean + allDirectives: Map[DirectiveId, (FullActiveTechnique, Directive)], + nodeFacts: MapView[NodeId, CoreNodeFact], + nodeSettings: Map[NodeId, RudderSettings], + rules: Seq[Rule], + allRuleInfos: Map[RuleId, (Chunk[NodeId], Option[PolicyMode])], + level: Option[Int], + isGlobalCompliance: Boolean )(implicit qc: QueryContext): IOResult[ByNodeGroupCompliance] = { val ruleMap = rules.map(r => (r.id, r)).toMap val ruleIds = ruleMap.keySet diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala index ec38e7676dc..38711779419 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala @@ -1316,7 +1316,7 @@ class GroupApiService14( def getNodePropertiesTree( groupId: NodeGroupId, renderInHtml: RenderInheritedProperties - )(implicit qc: QueryContext): IOResult[JRGroupInheritedProperties] = { + )(implicit qc: QueryContext): IOResult[JRGroupInheritedProperties] = { for { groupLibrary <- readGroup.getFullGroupLibrary() allGroups = groupLibrary.allGroups diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala index cc991c3fa2e..ab660462004 100644 --- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala +++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala @@ -42,7 +42,6 @@ import cats.data.Validated.Valid import cats.data.ValidatedNel import com.normation.box.* import com.normation.errors.* -import com.normation.eventlog.EventActor import com.normation.eventlog.ModificationId import com.normation.inventory.domain.* import com.normation.inventory.domain.NodeId diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala index 7f6a9b1d93a..6bfb599bf72 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala @@ -259,20 +259,20 @@ class MockCompliance(mockDirectives: MockDirectives) { def registerChangeCallbackAction(callback: NodeFactChangeEventCallback): IOResult[Unit] = ??? def getStatus(id: NodeId)(implicit qc: QueryContext): IOResult[InventoryStatus] = ??? - def get(nodeId: NodeId)(implicit qc: QueryContext, status: SelectNodeStatus): IOResult[Option[CoreNodeFact]] = ??? + def get(nodeId: NodeId)(implicit qc: QueryContext, status: SelectNodeStatus): IOResult[Option[CoreNodeFact]] = ??? def slowGet( nodeId: NodeId )(implicit qc: QueryContext, status: SelectNodeStatus, attrs: SelectFacts): IOResult[Option[NodeFact]] = ??? def getNodesbySofwareName(softName: String): IOResult[List[(NodeId, Software)]] = ??? - def slowGetAll()(implicit qc: QueryContext, status: SelectNodeStatus, attrs: SelectFacts): errors.IOStream[NodeFact] = ??? - def save(nodeFact: NodeFact)(implicit cc: ChangeContext, attrs: SelectFacts): IOResult[NodeFactChangeEventCC] = ??? - def setSecurityTag(nodeId: NodeId, tag: Option[SecurityTag])(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = + def slowGetAll()(implicit qc: QueryContext, status: SelectNodeStatus, attrs: SelectFacts): errors.IOStream[NodeFact] = ??? + def save(nodeFact: NodeFact)(implicit cc: ChangeContext, attrs: SelectFacts): IOResult[NodeFactChangeEventCC] = ??? + def setSecurityTag(nodeId: NodeId, tag: Option[SecurityTag])(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? def updateInventory(inventory: FullInventory, software: Option[Iterable[Software]])(implicit cc: ChangeContext ): IOResult[NodeFactChangeEventCC] = ??? - def changeStatus(nodeId: NodeId, into: InventoryStatus)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? - def delete(nodeId: NodeId)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? + def changeStatus(nodeId: NodeId, into: InventoryStatus)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? + def delete(nodeId: NodeId)(implicit cc: ChangeContext): IOResult[NodeFactChangeEventCC] = ??? } diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala index 7fa3b4c36d8..add17787d85 100644 --- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala +++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala @@ -198,7 +198,7 @@ class RestTestSetUp { implicit val userService: TestUserService = new TestUserService class TestUserService extends UserService { - val user: AuthenticatedUser = new AuthenticatedUser { + val user: AuthenticatedUser = new AuthenticatedUser { val account: RudderAccount = RudderAccount.User("test-user", "pass") def checkRights(auth: AuthorizationType) = true def getApiAuthz: ApiAuthz = ApiAuthz.allAuthz diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala index c4afe15ee5b..392dbe5d8f2 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala @@ -42,7 +42,6 @@ import com.normation.rudder.Role import com.normation.rudder.api.* import com.normation.rudder.domain.logger.ApplicationLogger import com.normation.rudder.facts.nodes.NodeSecurityContext -import com.normation.rudder.facts.nodes.QueryContext import com.normation.rudder.users.* import com.normation.rudder.users.RudderUserDetail import com.normation.rudder.web.services.UserSessionLogEvent @@ -463,7 +462,7 @@ class RudderXmlUserDetailsContextMapper(authConfigProvider: UserDetailListProvid } sealed trait ProviderRoleExtension { - def name: String + def name: String def priority: Int = this match { case ProviderRoleExtension.None => 0 case ProviderRoleExtension.NoOverride => 1 diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala index 21c06c6d701..9d9fc13542a 100644 --- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala @@ -92,8 +92,8 @@ import scala.util.matching.Regex import scala.xml.Elem import scala.xml.Node import scala.xml.NodeSeq -import zio.{System => _, _} -import zio.syntax._ +import zio.{System as _, *} +import zio.syntax.* /* * Utilities about rights
{c._2(server)}