Skip to content

Commit c2c6926

Browse files
committed
refactor(ScannerRun): Do not use SortedMap for scan results
Only sort on serialization for human readability and reproducibility. Signed-off-by: Frank Viernau <frank_viernau@epam.com>
1 parent 4b5ce1d commit c2c6926

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

model/src/main/kotlin/ScannerRun.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ package org.ossreviewtoolkit.model
2121

2222
import com.fasterxml.jackson.annotation.JsonIgnore
2323
import com.fasterxml.jackson.annotation.JsonIgnoreProperties
24+
import com.fasterxml.jackson.annotation.JsonPropertyOrder
2425

2526
import java.time.Instant
26-
import java.util.SortedMap
2727

2828
import org.ossreviewtoolkit.model.config.ScannerConfiguration
2929
import org.ossreviewtoolkit.utils.ort.Environment
@@ -56,7 +56,8 @@ data class ScannerRun(
5656
/**
5757
* The [ScanResult]s for all [Package]s.
5858
*/
59-
val scanResults: SortedMap<Identifier, List<ScanResult>>,
59+
@JsonPropertyOrder(alphabetic = true)
60+
val scanResults: Map<Identifier, List<ScanResult>>,
6061

6162
/**
6263
* The [AccessStatistics] for the scan results storage.
@@ -73,7 +74,7 @@ data class ScannerRun(
7374
endTime = Instant.EPOCH,
7475
environment = Environment(),
7576
config = ScannerConfiguration(),
76-
scanResults = sortedMapOf(),
77+
scanResults = emptyMap(),
7778
storageStats = AccessStatistics()
7879
)
7980
}

scanner/src/main/kotlin/Scanner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class Scanner(
130130
emptyMap()
131131
}
132132

133-
val scanResults = (projectResults + packageResults).toSortedMap()
133+
val scanResults = projectResults + packageResults
134134
val storageStats = AccessStatistics() // TODO: Record access statistics.
135135

136136
val endTime = Instant.now()

0 commit comments

Comments
 (0)