diff --git a/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/GoModFileParser.java b/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/GoModFileParser.java index 7d439b7d4b..b35b8496b6 100644 --- a/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/GoModFileParser.java +++ b/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/GoModFileParser.java @@ -33,7 +33,7 @@ public class GoModFileParser { private static final Pattern MODULE_PATTERN = Pattern.compile("^module\\s+(.+)$"); private static final Pattern GO_VERSION_PATTERN = Pattern.compile("^go\\s+(.+)$"); private static final Pattern TOOLCHAIN_PATTERN = Pattern.compile("^toolchain\\s+(.+)$"); - private static final Pattern DEPENDENCY_PATTERN = Pattern.compile("^\\s*([^\\s]+)\\s+([^\\s]+(?:-[^\\s]+)*)(?:\\s+//\\s*(.+))?$"); + private static final Pattern DEPENDENCY_PATTERN = Pattern.compile("^\\s*([^\\s]+)\\s+([^\\s]+)(?:\\s+//\\s*(.+))?$"); private static final Pattern REPLACE_PATTERN = Pattern.compile("^\\s*([^\\s]+)(?:\\s+([^\\s]+))?\\s+=>"); private static final Pattern COMMENT_PATTERN = Pattern.compile("^\\s*//.*$"); private static final Pattern EMPTY_LINE_PATTERN = Pattern.compile("^\\s*$"); diff --git a/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/model/GoDependencyNode.java b/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/model/GoDependencyNode.java index 0381051b82..45e7ce9713 100644 --- a/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/model/GoDependencyNode.java +++ b/detectable/src/main/java/com/blackduck/integration/detectable/detectables/go/gomodfile/parse/model/GoDependencyNode.java @@ -1,6 +1,7 @@ package com.blackduck.integration.detectable.detectables.go.gomodfile.parse.model; import java.util.List; +import java.util.Objects; import com.blackduck.integration.bdio.model.dependency.Dependency; @@ -45,6 +46,11 @@ public boolean equals(Object o) { return dependency != null ? dependency.equals(that.dependency) : that.dependency == null; } + + @Override + public int hashCode() { + return Objects.hash(dependency, children, isRootNode); + } /** * Utility method to get the total count of all dependencies in the graph (including transitive).