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

Code tweak: reduce switch statements in DependencyCheckReport #1

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Code tweak: reduce switch statements in DependencyCheckReport #1

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
25 changes: 9 additions & 16 deletions sbt-version-policy/src/main/scala/sbtversionpolicy/DependencyCheckReport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,15 @@ import coursier.version.{ModuleMatchers, Version, VersionCompatibility}
import lmcoursier.definitions.{ModuleMatchers => *, *}

case class DependencyCheckReport(
binaryCompatibilityReport: Map[(String, String), DependencyCheckReport.ModuleStatus],
sourceCompatibilityReport: Map[(String, String), DependencyCheckReport.ModuleStatus]
compatibilityReports: Map[IncompatibilityType, Map[(String, String), DependencyCheckReport.ModuleStatus]]
) {

def validated(incompatibilityType: IncompatibilityType): Boolean =
incompatibilityType match {
case IncompatibilityType.BinaryIncompatibility => binaryCompatibilityReport.forall(_._2.validated)
case IncompatibilityType.SourceIncompatibility => sourceCompatibilityReport.forall(_._2.validated)
}
compatibilityReports(incompatibilityType).forall(_._2.validated)

def errors(incompatibilityType: IncompatibilityType, ignored: Set[(String, String)] = Set.empty): (Seq[String], Seq[String]) = {

val relevantErrors =
incompatibilityType match {
case IncompatibilityType.BinaryIncompatibility => binaryCompatibilityReport
case IncompatibilityType.SourceIncompatibility => sourceCompatibilityReport
}
val relevantErrors = compatibilityReports(incompatibilityType)

val baseErrors = relevantErrors
.filter(!_._2.validated)
Expand Down Expand Up @@ -72,12 +64,13 @@ object DependencyCheckReport {
defaultReconciliation: VersionCompatibility
): DependencyCheckReport = {

val binaryCompatibilityReport =
moduleStatuses(Compatibility.BinaryCompatible, currentModules, previousModules, reconciliations, defaultReconciliation)
val sourceCompatibilityReport =
moduleStatuses(Compatibility.BinaryAndSourceCompatible, currentModules, previousModules, reconciliations, defaultReconciliation)
def report(compatibility: Compatibility) =
moduleStatuses(compatibility, currentModules, previousModules, reconciliations, defaultReconciliation)

DependencyCheckReport(binaryCompatibilityReport, sourceCompatibilityReport)
DependencyCheckReport(Map(
IncompatibilityType.BinaryIncompatibility -> report(Compatibility.BinaryCompatible),
IncompatibilityType.SourceIncompatibility -> report(Compatibility.BinaryAndSourceCompatible)
))
}

@deprecated("This method is internal.", "1.1.0")
Expand Down