From 9cdfc22741f1f7935ed04d1a78288446d0dc4568 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 3 Jan 2023 13:05:03 +0100
Subject: Include list of installed application bundles in error message

---
 .../com/yahoo/container/core/config/HandlersConfigurerDi.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'container-core/src/main/java/com/yahoo/container')

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index e2f97c9ad6b..903169b1795 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -15,6 +15,7 @@ import com.yahoo.container.di.config.SubscriberFactory;
 import com.yahoo.container.logging.AccessLog;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
 import com.yahoo.jdisc.application.OsgiFramework;
+import com.yahoo.jdisc.core.BsnVersion;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.service.ClientProvider;
 import com.yahoo.jdisc.service.ServerProvider;
@@ -29,6 +30,7 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 /**
  * For internal use only.
@@ -107,6 +109,14 @@ public class HandlersConfigurerDi {
         public Set<Bundle> completeBundleGeneration(GenerationStatus status) {
             return applicationBundleLoader.completeGeneration(status);
         }
+
+        @Override
+        protected String bundleResolutionErrorMessage() {
+            return String.format("Installed application bundles: [%s].",
+                                 applicationBundleLoader.activeBundlesBsnVersion().stream()
+                                         .map(BsnVersion::toReadableString)
+                                         .collect(Collectors.joining(", ")));
+        }
     }
 
     /**
-- 
cgit v1.2.3