From cf7cf81ea64c016e5dcc9032462624ddb4460842 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 13 Dec 2021 08:34:42 +0100 Subject: Revert "Merge pull request #20456 from vespa-engine/revert-20439-bratseth/zoneinfo-in-query-profile-context" This reverts commit 2780822f7d1fc66ea2833b2b7aaa2b9cb74f5833, reversing changes made to 8ff6429daf9a695f2fa5d45a8033c75fdadfcfe2. --- .../java/com/yahoo/jdisc/application/ContainerBuilder.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'jdisc_core/src/main') 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; /** *

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()); - this.clientBindings.put(BindingSet.DEFAULT, new BindingRepository()); + 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; } + } -- cgit v1.2.3