Skip to content

Commit

Permalink
refactor(model): Handle UnknownProvenance in toPurlExtras()
Browse files Browse the repository at this point in the history
Make `toPurlExtras()` more symmetric to `toProvenance()` by also
hanlding `UnknownProvenance`, which simply results in empty
`PurlExtras`.

Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed Jan 11, 2024
1 parent 19553b6 commit 0794697
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions model/src/main/kotlin/utils/PurlExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import java.net.URLDecoder
import org.ossreviewtoolkit.model.ArtifactProvenance
import org.ossreviewtoolkit.model.Hash
import org.ossreviewtoolkit.model.Identifier
import org.ossreviewtoolkit.model.KnownProvenance
import org.ossreviewtoolkit.model.Package
import org.ossreviewtoolkit.model.Provenance
import org.ossreviewtoolkit.model.RemoteArtifact
Expand Down Expand Up @@ -77,9 +76,9 @@ fun Identifier.toPurl(qualifiers: Map<String, String> = emptyMap(), subpath: Str
fun Identifier.toPurl(extras: PurlExtras) = toPurl(extras.qualifiers, extras.subpath)

/**
* Encode a [KnownProvenance] to extra qualifying data / a subpath of PURL.
* Encode a [Provenance] to extra qualifying data / a subpath of PURL.
*/
fun KnownProvenance.toPurlExtras(): PurlExtras =
fun Provenance.toPurlExtras(): PurlExtras =
when (this) {
is ArtifactProvenance -> with(sourceArtifact) {
val checksum = "${hash.algorithm.name.lowercase()}:${hash.value}"
Expand All @@ -98,6 +97,8 @@ fun KnownProvenance.toPurlExtras(): PurlExtras =
subpath = vcsInfo.path
)
}

is UnknownProvenance -> PurlExtras()
}

/**
Expand Down

0 comments on commit 0794697

Please sign in to comment.