From dbd67d246b27922039e4375b3ac48cd0f6edce1a Mon Sep 17 00:00:00 2001 From: Gerd Wuetherich Date: Wed, 25 Mar 2020 14:55:17 +0100 Subject: [PATCH] #18 fixed dependency order --- .../server/graphql/hierarchicalgraph/Dependency.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java b/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java index fbd458b..0e45f3e 100644 --- a/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java +++ b/slizaa-server/slizaa-server-graphql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/Dependency.java @@ -24,6 +24,7 @@ import io.codekontor.slizaa.hierarchicalgraph.core.model.HGProxyDependency; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -80,7 +81,11 @@ public List resolvedDependencies() { proxyDependency.resolve(); } List coreDependencies = ((HGProxyDependency)_hgDependency).getAccumulatedCoreDependencies(); - return coreDependencies.stream().map(coreDep -> new Dependency(coreDep)).collect(Collectors.toList()); + return coreDependencies.stream() + .map(coreDep -> new Dependency(coreDep)) + + .sorted(Comparator.comparing(dep -> dep.getSourceNode().getText() + dep.getType() + dep.getTargetNode())) + .collect(Collectors.toList()); } return Collections.emptyList(); }