Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.freenow.sauron.plugins.elasticsearch;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand All @@ -10,6 +11,7 @@
import com.freenow.sauron.plugins.NormalizeDependencyVersion;
import com.freenow.sauron.plugins.ProjectType;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.cyclonedx.model.Component;
import org.cyclonedx.model.LicenseChoice;

Expand All @@ -19,12 +21,14 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

import static ch.qos.logback.core.CoreConstants.EMPTY_STRING;

@Slf4j
@Data
public class DependenciesModel
{
Expand Down Expand Up @@ -62,6 +66,8 @@ public Map<String, Object> getDependencies() {
@Data
private static class Dependency
{
@JsonIgnore
private final String name;
private final String version;
private final String normalizedVersion;
private final String license;
Expand Down Expand Up @@ -115,11 +121,18 @@ public static DependenciesModel from(DataSet dataSet, List<Component> dependenci
String license = licenses.stream().findFirst().flatMap(l -> Optional.ofNullable(l.getId())).orElse(EMPTY_STRING);

return new Dependency(
determineKey(projectType, dependency),
version,
normalizedVersion,
license,
licenses
);
},
(dependency1, dependency2) -> {
if (!Objects.equals(dependency1, dependency2)) {
log.warn("Inconsistent duplicated dependency found: {}, {}", dependency1, dependency2);
}
return dependency1;
}
))
);
Expand Down