Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #16673: Avoid Seq[Node] in place of NodeSeq with updated version of scala-xml #2758

Merged
merged 1 commit into from Feb 4, 2020
Merged

Fixes #16673: Avoid Seq[Node] in place of NodeSeq with updated version of scala-xml #2758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion webapp/sources/pom.xml
View file
Open in desktop
Expand Up @@ -352,7 +352,7 @@ limitations under the License.
<scala-version>2.13.1</scala-version>
<scala-binary-version>2.13</scala-binary-version>
<scala-parser-combinators-version>1.1.2</scala-parser-combinators-version>
<scala-xml-version>1.2.0</scala-xml-version>
<scala-xml-version>1.2.0.1-rudder</scala-xml-version>
<lift-version>3.4.1</lift-version>
<slf4j-version>1.7.28</slf4j-version>
<logback-version>1.2.3</logback-version>
Expand Down
8 changes: 4 additions & 4 deletions ...r-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala
View file
Open in desktop
Expand Up @@ -727,11 +727,11 @@ class EventLogDetailsServiceImpl(
for{
event <- xml
eventlogs <- event.child
entry <- eventlogs \ "rollbackedEvent"
entry <- (eventlogs \ "rollbackedEvent").iterator
id <- (entry \ "id").headOption.map(_.text.toInt) ?~! ("Entry type is not a 'rollback': %s".format(entry))
evtType <-(entry \ "type").headOption.map(_.text) ?~! ("Entry type is not a 'rollback': %s".format(entry))
author <-(entry \ "author").headOption.map(_.text) ?~! ("Entry type is not a 'rollback': %s".format(entry))
date <-(entry \ "date").headOption.map(_.text) ?~! ("Entry type is not a 'rollback': %s".format(entry))
evtType <- (entry \ "type").headOption.map(_.text) ?~! ("Entry type is not a 'rollback': %s".format(entry))
author <- (entry \ "author").headOption.map(_.text) ?~! ("Entry type is not a 'rollback': %s".format(entry))
date <- (entry \ "date").headOption.map(_.text) ?~! ("Entry type is not a 'rollback': %s".format(entry))
} yield {
RollbackedEvent(id,date,evtType,author)
}
Expand Down
8 changes: 4 additions & 4 deletions ...ore/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
View file
Open in desktop
Expand Up @@ -434,7 +434,7 @@ class ChangeRequestChangesUnserialisationImpl (
(for {
groupsNode <- (changeRequest \ "groups").headOption ?~! s"Missing child 'groups' in entry type changeRequest : ${xml}"
} yield {
(groupsNode\"group").flatMap{ group =>
(groupsNode \ "group").iterator.flatMap { group =>
for {
nodeGroupId <- group.attribute("id").map(id => NodeGroupId(id.text)) ?~!
s"Missing attribute 'id' in entry type changeRequest group changes : ${group}"
Expand Down Expand Up @@ -472,7 +472,7 @@ class ChangeRequestChangesUnserialisationImpl (
(for {
directivesNode <- (changeRequest \ "directives").headOption ?~! s"Missing child 'directives' in entry type changeRequest : ${xml}"
} yield {
(directivesNode\"directive").flatMap{ directive =>
(directivesNode \ "directive").iterator.flatMap { directive =>
for {
directiveId <- directive.attribute("id").map(id => DirectiveId(id.text)) ?~!
s"Missing attribute 'id' in entry type changeRequest directive changes : ${directive}"
Expand Down Expand Up @@ -526,7 +526,7 @@ class ChangeRequestChangesUnserialisationImpl (
rulesNode <- (changeRequest \ "rules").headOption ?~! s"Missing child 'rules' in entry type changeRequest : ${xml}"
} yield {

(rulesNode\"rule").flatMap{ rule =>
(rulesNode \ "rule").iterator.flatMap { rule =>
for {
ruleId <- rule.attribute("id").map(id => RuleId(id.text)) ?~!
s"Missing attribute 'id' in entry type changeRequest rule changes : ${rule}"
Expand Down Expand Up @@ -564,7 +564,7 @@ class ChangeRequestChangesUnserialisationImpl (
(for {
paramsNode <- (changeRequest \ "globalParameters").headOption ?~! s"Missing child 'globalParameters' in entry type changeRequest : ${xml}"
} yield {
(paramsNode\"globalParameter").flatMap{ param =>
(paramsNode \ "globalParameter").iterator.flatMap{ param =>
for {
paramName <- param.attribute("name").map(name => ParameterName(name.text)) ?~!
s"Missing attribute 'name' in entry type globalParameters Global Parameter changes : ${param}"
Expand Down
1 change: 0 additions & 1 deletion ...der/rudder-core/src/main/scala/com/normation/rudder/services/reports/ExecutionBatch.scala
View file
Open in desktop
Expand Up @@ -918,7 +918,6 @@ final case class ContextForNoAnswer(

// note: isn't there something specific to do for unexpected reports ? Keep them all ?

val nil = Seq[RuleNodeStatusReport]()
val currentRunReports = buildRuleNodeStatusReport(mergeInfo, currentConfig, ReportType.Pending)
val t11 = System.currentTimeMillis

Expand Down