Facilitate debugging with less functional style

2 files changed, 14 insertions, 12 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index f84a1ecd7f5..b3005062e1d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -43,7 +43,6 @@ import static com.yahoo.config.provision.Environment.staging;
 import static com.yahoo.config.provision.Environment.test;
 import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.stagingTest;
 import static com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType.systemTest;
-import static java.util.Collections.reverseOrder;
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.naturalOrder;
 import static java.util.Objects.requireNonNull;
@@ -265,16 +264,18 @@ public class DeploymentStatus {
      * For the "exclusive" revision upgrade policy it is the oldest such revision; otherwise, it is the latest.
      */
     public Change outstandingChange(InstanceName instance) {
-        return Optional.ofNullable(instanceSteps().get(instance))
-                       .flatMap(instanceStatus -> application.deployableVersions(application.deploymentSpec().requireInstance(instance).revisionTarget() == next).stream()
-                                                             .filter(version -> instanceStatus.dependenciesCompletedAt(Change.of(version), Optional.empty()).map(at -> ! at.isAfter(now)).orElse(false))
-                                                             .filter(version -> application.productionDeployments().getOrDefault(instance, List.of()).stream()
-                                                                                           .noneMatch(deployment -> deployment.applicationVersion().compareTo(version) > 0))
-                                                             .map(Change::of)
-                                                             .filter(change -> application.require(instance).change().application().map(change::upgrades).orElse(true))
-                                                             .filter(change -> ! hasCompleted(instance, change))
-                                                             .findFirst())
-                       .orElse(Change.empty());
+        StepStatus status = instanceSteps().get(instance);
+        if (status == null) return Change.empty();
+        for (ApplicationVersion version : application.deployableVersions(application.deploymentSpec().requireInstance(instance).revisionTarget() == next)) {
+            if (status.dependenciesCompletedAt(Change.of(version), Optional.empty()).map(now::isBefore).orElse(true)) continue;
+            Change change = Change.of(version);
+            if (application.productionDeployments().getOrDefault(instance, List.of()).stream()
+                           .anyMatch(deployment -> change.downgrades(deployment.applicationVersion()))) continue;
+            if ( ! application.require(instance).change().application().map(change::upgrades).orElse(true)) continue;
+            if (hasCompleted(instance, change)) continue;
+            return change;
+        }
+        return Change.empty();
     }
 
     /** Earliest instant when job was triggered with given versions, or both system and staging tests were successful. */
diff --git a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
index 2c93312eb6d..f035e2c6f00 100644
--- a/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
+++ b/vespajlib/src/main/java/com/yahoo/collections/AbstractFilteringList.java
@@ -8,6 +8,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -99,7 +100,7 @@ public abstract class AbstractFilteringList<Type, ListType extends AbstractFilte
     /** Returns the items grouped by the given classifier. */
     public final <OtherType> Map<OtherType, ListType> groupingBy(Function<Type, OtherType> classifier) {
         return items.stream().collect(Collectors.groupingBy(classifier,
-                                                            HashMap::new,
+                                                            LinkedHashMap::new,
                                                             Collectors.collectingAndThen(toUnmodifiableList(),
                                                                                          (list) -> constructor.apply(list, false))));
     }