diff options
author | Jon Bratseth <bratseth@oath.com> | 2021-12-10 14:01:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-10 14:01:39 +0100 |
commit | 13fb8a9a0f83d1d880e6cabcaf883c1af0dae1dd (patch) | |
tree | f0112193f9af6288ddbe784c7d6005f53a643a6c /jdisc_core/src/main/java/com/yahoo/jdisc | |
parent | 4b208ff41f0f574532aa3a48007e578adcfa6a46 (diff) | |
parent | 601da313b6c7b0ddb005d0870b16160d9c2a5f46 (diff) |
Merge pull request #20439 from vespa-engine/bratseth/zoneinfo-in-query-profile-context
Add zone info to query profile context
Diffstat (limited to 'jdisc_core/src/main/java/com/yahoo/jdisc')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java index db7d7e82ffb..eb602737c8f 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/ContainerBuilder.java @@ -8,8 +8,11 @@ import com.google.inject.Module; import com.yahoo.jdisc.Container; import com.yahoo.jdisc.handler.RequestHandler; -import java.util.*; -import java.util.concurrent.ThreadFactory; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; /** * <p>This is the inactive, mutable {@link Container}. Because it requires references to the application internals, it @@ -38,8 +41,8 @@ public class ContainerBuilder { bind(ContainerBuilder.class).toInstance(ContainerBuilder.this); } }); - this.serverBindings.put(BindingSet.DEFAULT, new BindingRepository<RequestHandler>()); - this.clientBindings.put(BindingSet.DEFAULT, new BindingRepository<RequestHandler>()); + this.serverBindings.put(BindingSet.DEFAULT, new BindingRepository<>()); + this.clientBindings.put(BindingSet.DEFAULT, new BindingRepository<>()); } public void setAppContext(Object ctx) { @@ -130,4 +133,5 @@ public class ContainerBuilder { } return lst; } + } |