more cleanups

line · Nov 4, 2022 · 11e8e18 · 11e8e18
1 parent 38eab8e
commit 11e8e18
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/core/src/main/java/com/linecorp/armeria/server/ServerBuilder.java b/core/src/main/java/com/linecorp/armeria/server/ServerBuilder.java
@@ -99,7 +99,6 @@
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.util.Mapping;
 import io.netty.util.NetUtil;
-import io.netty.util.concurrent.GlobalEventExecutor;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 
 /**

diff --git a/core/src/test/java/com/linecorp/armeria/server/ServerTest.java b/core/src/test/java/com/linecorp/armeria/server/ServerTest.java
@@ -418,7 +418,7 @@ void defaultStartStopExecutor() {
         threads.add(server.stop().thenApply(unused -> Thread.currentThread()).join());
         threads.add(server.start().thenApply(unused -> Thread.currentThread()).join());
 
-        threads.forEach(t -> assertThat(t.getName()).startsWith("globalEventExecutor"));
+        threads.forEach(t -> assertThat(t.getName()).startsWith("startstop-support"));
     }
 
     @Test

diff --git a/...nal/src/main/java/com/linecorp/armeria/internal/testing/ArmeriaBlockHoundIntegration.java b/...nal/src/main/java/com/linecorp/armeria/internal/testing/ArmeriaBlockHoundIntegration.java
@@ -32,9 +32,6 @@ public void applyTo(Builder builder) {
                                          "pool");
         builder.allowBlockingCallsInside("com.linecorp.armeria.testing.server.ServiceRequestContextCaptor$2",
                                          "serve");
-        // jetty server is started up from GlobalEventExecutor
-        builder.allowBlockingCallsInside("com.linecorp.armeria.server.jetty.JettyService",
-                                         "start");
 
         // graphql
         builder.allowBlockingCallsInside("graphql.i18n.I18n", "i18n");