summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-03-07 16:47:02 +0100
committerGitHub <noreply@github.com>2017-03-07 16:47:02 +0100
commitcef4d7d49fa401034e653739b7ab30aef6f4d480 (patch)
tree8535d14daf973b4d7bd50788e50a88e7abcf5c21
parent00e4e7eb60b7bff9a25c927eac831476b583f414 (diff)
parent66307da2655ed4a5bb6b6e265dff3f061f572785 (diff)
Merge pull request #1946 from yahoo/gjoranv/simplify-list-mapping
Simplify generation of display name.
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java14
1 files changed, 5 insertions, 9 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index fe157f522ed..300cf13bfa6 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
@@ -55,6 +55,7 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
import static com.yahoo.jdisc.http.server.jetty.ConnectorFactory.JDiscServerConnector;
import static com.yahoo.jdisc.http.server.jetty.Exceptions.throwUnchecked;
@@ -120,15 +121,6 @@ public class JettyHttpServer extends AbstractServerProvider {
private final Server server;
private final List<Integer> listenedPorts = new ArrayList<>();
- private static String getDisplayName(List<Integer> ports) {
- StringBuilder allPorts = new StringBuilder();
- allPorts.append(ports.get(0));
- for (int i = 1; i < ports.size(); i++) {
- allPorts.append(":").append(ports.get(i));
- }
- return allPorts.toString();
- }
-
@Inject
public JettyHttpServer(
final CurrentContainer container,
@@ -285,6 +277,10 @@ public class JettyHttpServer extends AbstractServerProvider {
return servletContextHandler;
}
+ private static String getDisplayName(List<Integer> ports) {
+ return ports.stream().map(Object::toString).collect(Collectors.joining(":"));
+ }
+
private ServerSocketChannel getChannelFromServiceLayer(int listenPort, BundleContext bundleContext) {
log.log(Level.FINE, "Retrieving channel for port " + listenPort + " from " + bundleContext.getClass().getName());
Collection<ServiceReference<ServerSocketChannel>> refs;