Fixing more tests

blackducksoftware · Aug 30, 2017 · 8e93e58 · 8e93e58
1 parent 8879e67
commit 8e93e58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...in/groovy/com/blackducksoftware/integration/hub/detect/nameversion/NameVersionNode.groovy b/...in/groovy/com/blackducksoftware/integration/hub/detect/nameversion/NameVersionNode.groovy
@@ -26,11 +26,11 @@ package com.blackducksoftware.integration.hub.detect.nameversion
 interface NameVersionNode {
     public String getName()
     public String getVersion()
-    public List<NameVersionNode> getChildren()
+    public List<? extends NameVersionNode> getChildren()
     public NodeMetadata getMetadata()
 
     public void setName(String name)
     public void setVersion(String version)
-    public void setChildren(List<NameVersionNode> children)
+    public void setChildren(List<? extends NameVersionNode> children)
     public void setMetadata(NodeMetadata metadata)
 }
diff --git a/...cksoftware/integration/hub/detect/nameversion/builder/LinkedNameVersionNodeBuilder.groovy b/...cksoftware/integration/hub/detect/nameversion/builder/LinkedNameVersionNodeBuilder.groovy
@@ -25,7 +25,6 @@ package com.blackducksoftware.integration.hub.detect.nameversion.builder
 import com.blackducksoftware.integration.hub.detect.nameversion.NameVersionNode
 import com.blackducksoftware.integration.hub.detect.nameversion.metadata.LinkMetadata
 
-@groovy.transform.TypeChecked
 class LinkedNameVersionNodeBuilder extends NameVersionNodeBuilderImpl {
 
     public LinkedNameVersionNodeBuilder(NameVersionNode root) {
@@ -38,9 +37,7 @@ class LinkedNameVersionNodeBuilder extends NameVersionNodeBuilderImpl {
         Set<String> cyclicalNames = new HashSet<>()
 
         NameVersionNode resolved = resolveLinks(cyclicalNames, cyclicalStack, root)
-        cyclicalNames.each {
-            logger.debug("Cyclical depdency detected: ${it}")
-        }
+        cyclicalNames.each { logger.debug("Cyclical depdency detected: ${it}") }
 
         resolved
     }
@@ -66,7 +63,7 @@ class LinkedNameVersionNodeBuilder extends NameVersionNodeBuilderImpl {
 
         if (resolvedNode) {
             List<NameVersionNode> resolvedChildren = []
-            for (NameVersionNode child : nameVersionNode.children) {
+            for (NameVersionNode child : resolvedNode.children) {
                 NameVersionNode resolvedChild = resolveLinks(cyclicalNames, cyclicalStack, child)
                 if (resolvedChild) {
                     resolvedChildren.add(resolvedChild)