From d39c153e007d4b613ba7e4dbe3f222691861d1c8 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Tue, 25 Jan 2022 14:41:35 +0100
Subject: Include generation number in log message for deconstruction

---
 .../container/core/config/testutil/HandlersConfigurerTestWrapper.java | 2 +-
 .../src/main/java/com/yahoo/container/di/ComponentDeconstructor.java  | 2 +-
 container-core/src/main/java/com/yahoo/container/di/Container.java    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index eadb6b52294..5178b864e8e 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -109,7 +109,7 @@ public class HandlersConfigurerTestWrapper {
     }
 
     private ComponentDeconstructor getTestDeconstructor() {
-        return (components, bundles) -> components.forEach(component -> {
+        return (generation, components, bundles) -> components.forEach(component -> {
             if (component instanceof AbstractComponent) {
                 AbstractComponent abstractComponent = (AbstractComponent) component;
                 if (abstractComponent.isDeconstructable()) abstractComponent.deconstruct();
diff --git a/container-core/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java b/container-core/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java
index 95a15e12735..0df91103985 100644
--- a/container-core/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java
+++ b/container-core/src/main/java/com/yahoo/container/di/ComponentDeconstructor.java
@@ -13,7 +13,7 @@ import java.util.List;
 public interface ComponentDeconstructor {
 
     /** Deconstructs the given components in order, then the given bundles. */
-    void deconstruct(List<Object> components, Collection<Bundle> bundles);
+    void deconstruct(long generation, List<Object> components, Collection<Bundle> bundles);
 
     /** Wait for all previous destruction tasks to complete */
     default void shutdown() {}
diff --git a/container-core/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java
index 8d8a05408a9..b37a7b9f69f 100644
--- a/container-core/src/main/java/com/yahoo/container/di/Container.java
+++ b/container-core/src/main/java/com/yahoo/container/di/Container.java
@@ -171,7 +171,7 @@ public class Container {
             if ( ! newComponents.containsKey(component))
                 obsoleteComponents.add(component);
 
-        return () -> componentDeconstructor.deconstruct(obsoleteComponents, obsoleteBundles);
+        return () -> componentDeconstructor.deconstruct(oldGraph.generation(), obsoleteComponents, obsoleteBundles);
     }
 
     private Set<Bundle> installApplicationBundles(Map<ConfigKey<? extends ConfigInstance>, ConfigInstance> configsIncludingBootstrapConfigs) {
@@ -264,7 +264,7 @@ public class Container {
 
     private void deconstructAllComponents(ComponentGraph graph, ComponentDeconstructor deconstructor) {
         // This is only used for shutdown, so no need to uninstall any bundles.
-        deconstructor.deconstruct(graph.allConstructedComponentsAndProviders(), Collections.emptyList());
+        deconstructor.deconstruct(graph.generation(), graph.allConstructedComponentsAndProviders(), Collections.emptyList());
     }
 
     public static <T extends ConfigInstance> T getConfig(ConfigKey<T> key,
-- 
cgit v1.2.3