resolve conflicts

blackducksoftware · Mar 6, 2020 · 74bd70e · 74bd70e
2 parents 41978e2 + 321e6d8
commit 74bd70e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...java/com/synopsys/integration/bdio/graph/builder/LazyBuilderMissingExternalIdHandler.java b/...java/com/synopsys/integration/bdio/graph/builder/LazyBuilderMissingExternalIdHandler.java
@@ -22,9 +22,10 @@
  */
 package com.synopsys.integration.bdio.graph.builder;
 
+import com.synopsys.integration.bdio.model.dependencyid.DependencyId;
 import com.synopsys.integration.bdio.model.externalid.ExternalId;
 
 @FunctionalInterface
 public interface LazyBuilderMissingExternalIdHandler {
-    ExternalId handleMissingExternalId(LazyExternalIdDependencyGraphBuilder.LazyDependencyInfo lazyDependencyInfo) throws MissingExternalIdException;
+    ExternalId handleMissingExternalId(final DependencyId dependencyId, final LazyExternalIdDependencyGraphBuilder.LazyDependencyInfo lazyDependencyInfo) throws MissingExternalIdException;
 }
diff --git a/...ava/com/synopsys/integration/bdio/graph/builder/LazyExternalIdDependencyGraphBuilder.java b/...ava/com/synopsys/integration/bdio/graph/builder/LazyExternalIdDependencyGraphBuilder.java
@@ -36,7 +36,7 @@
 import com.synopsys.integration.bdio.model.externalid.ExternalId;
 
 public class LazyExternalIdDependencyGraphBuilder {
-    static class LazyDependencyInfo {
+    public static class LazyDependencyInfo {
         private Set<DependencyId> children = new HashSet<>();
         private DependencyId aliasId;
         private ExternalId externalId;
@@ -96,11 +96,11 @@ private LazyDependencyInfo infoForId(final DependencyId id) {
     }
 
     public DependencyGraph build() throws MissingExternalIdException {
-        return build(lazyDependencyInfo -> {
+        return build((dependencyId, lazyDependencyInfo) -> {
             if (lazyDependencyInfo != null && lazyDependencyInfo.aliasId != null) {
                 throw new MissingExternalIdException(lazyDependencyInfo.aliasId);
             } else {
-                throw new MissingExternalIdException(null);
+                throw new MissingExternalIdException(dependencyId);
             }
         });
     }
@@ -111,7 +111,7 @@ public DependencyGraph build(LazyBuilderMissingExternalIdHandler lazyBuilderHand
         for (final DependencyId dependencyId : dependencyInfo.keySet()) {
             final LazyDependencyInfo lazyDependencyInfo = infoForId(dependencyId);
             if (lazyDependencyInfo.getExternalId() == null) {
-                final ExternalId handledExternalId = lazyBuilderHandler.handleMissingExternalId(lazyDependencyInfo);
+                final ExternalId handledExternalId = lazyBuilderHandler.handleMissingExternalId(dependencyId, lazyDependencyInfo);
                 if (handledExternalId == null || dependencyId == null) {
                     throw new MissingExternalIdException(dependencyId);
                 } else {