fixed package dependency resolution for multiple packages configured

Author: hhund

src/main/java/dev/dsf/fhir/validator/implementation_guide/ValidationPackageManagerImpl.java

@@ -9,7 +9,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,10 +73,11 @@ public List<ValidationPackageWithDepedencies> downloadPackagesWithDependencies(
 			packages.add(ValidationPackageWithDepedencies.from(packagesByNameAndVersion, identifier));
 		}
 
-		logger.info("Using packages {} for validation",
-				packages.stream().flatMap(p -> Stream.concat(Stream.of(p), p.getDependencies().stream()))
-						.map(ValidationPackage::getIdentifier).map(ValidationPackageIdentifier::toString).sorted()
-						.collect(Collectors.joining(", ", "[", "]")));
+		logger.info("Validating with packages {}",
+				packages.stream().map(p -> p.getIdentifier().toString() + " {dependencies: "
+						+ p.getDependencies().stream().map(ValidationPackage::getIdentifier)
+								.map(ValidationPackageIdentifier::toString).sorted().collect(Collectors.joining(", "))
+						+ "}").collect(Collectors.joining(", ", "[", "]")));
 
 		return packages;
 	}
@@ -88,6 +88,9 @@ private void downloadPackageWithDependencies(ValidationPackageIdentifier identif
 	{
 		if (allPackagesByNameAndVersion.containsKey(identifier))
 		{
+			ValidationPackage dependency = allPackagesByNameAndVersion.get(identifier);
+			packagesByNameAndVersion.put(identifier, dependency);
+
 			// already downloaded
 			return;
 		}
@@ -103,6 +106,9 @@ else if (noDownloadPackages.contains(identifier))
 		// check again, as the identifier may have changed from a A.B.x wildcard
 		if (allPackagesByNameAndVersion.containsKey(identifier))
 		{
+			ValidationPackage dependency = allPackagesByNameAndVersion.get(identifier);
+			packagesByNameAndVersion.put(identifier, dependency);
+
 			// already downloaded
 			return;
 		}