Simplify

1 files changed, 14 insertions, 27 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 e2cf4574a75..6550d9b5386 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
@@ -13,6 +13,9 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toUnmodifiableMap;
 
 /**
  * <p>This is the inactive, mutable {@link Container}. Because it requires references to the application internals, it
@@ -71,42 +74,26 @@ public class ContainerBuilder {
         return serverBindings.get(BindingSet.DEFAULT);
     }
 
-    public BindingRepository<RequestHandler> serverBindings(String setName) {
-        BindingRepository<RequestHandler> ret = serverBindings.get(setName);
-        if (ret == null) {
-            ret = new BindingRepository<>();
-            serverBindings.put(setName, ret);
-        }
-        return ret;
+    public BindingRepository<RequestHandler> clientBindings() {
+        return clientBindings.get(BindingSet.DEFAULT);
     }
 
-    public Map<String, BindingSet<RequestHandler>> activateServerBindings() {
-        Map<String, BindingSet<RequestHandler>> ret = new HashMap<>();
-        for (Map.Entry<String, BindingRepository<RequestHandler>> entry : serverBindings.entrySet()) {
-            ret.put(entry.getKey(), entry.getValue().activate());
-        }
-        return ImmutableMap.copyOf(ret);
+    public BindingRepository<RequestHandler> serverBindings(String setName) {
+        return serverBindings.computeIfAbsent(setName, __ -> new BindingRepository<>());
     }
 
-    public BindingRepository<RequestHandler> clientBindings() {
-        return clientBindings.get(BindingSet.DEFAULT);
+    public BindingRepository<RequestHandler> clientBindings(String setName) {
+        return clientBindings.computeIfAbsent(setName, __ -> new BindingRepository<>());
     }
 
-    public BindingRepository<RequestHandler> clientBindings(String setName) {
-        BindingRepository<RequestHandler> ret = clientBindings.get(setName);
-        if (ret == null) {
-            ret = new BindingRepository<>();
-            clientBindings.put(setName, ret);
-        }
-        return ret;
+    public Map<String, BindingSet<RequestHandler>> activateServerBindings() {
+        return serverBindings.entrySet().stream().collect(toUnmodifiableMap(entry -> entry.getKey(),
+                                                                            entry -> entry.getValue().activate()));
     }
 
     public Map<String, BindingSet<RequestHandler>> activateClientBindings() {
-        Map<String, BindingSet<RequestHandler>> ret = new HashMap<>();
-        for (Map.Entry<String, BindingRepository<RequestHandler>> entry : clientBindings.entrySet()) {
-            ret.put(entry.getKey(), entry.getValue().activate());
-        }
-        return ImmutableMap.copyOf(ret);
+        return clientBindings.entrySet().stream().collect(toUnmodifiableMap(entry -> entry.getKey(),
+                                                                            entry -> entry.getValue().activate()));
     }
 
     @SuppressWarnings({ "unchecked" })