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

Fix conflicts to main #1269

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Fix conflicts to main #1269

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Privado Core

Branch structure


main - This branch will contain the released version of the code.

dev - This branch will be used to merge all under-development features.
Expand Down
4 changes: 1 addition & 3 deletions src/main/scala/ai/privado/inputprocessor/DynamicRuleMerger.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ trait DynamicRuleMerger {
val externalOtherRule = new ListBuffer[RuleInfo]

val internalRuleMap = mutable.Map(
internalSinkRules
.filter(rule => rule.domains.nonEmpty && rule.name.nonEmpty)
.map(rule => ((rule.domains.headOption.get, rule.name, rule.filterProperty), rule)): _*
internalSinkRules.map(rule => ((rule.domains.headOption.get, rule.name, rule.filterProperty), rule))*
)

externalSinkRules.foreach { externalRule =>
Expand Down
Loading