Skip to content

Commit 37405b4

Browse files
committed
revert
1 parent f0e1f15 commit 37405b4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Diff for: src/main/java/info/unterrainer/commons/httpserver/GenericHandlerGroup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.List;
77
import java.util.Map.Entry;
88
import java.util.Set;
9-
import info.unterrainer.server.overmindserver.baseobjects.LimitedExecutorService;
9+
import java.util.concurrent.ExecutorService;
1010

1111
import info.unterrainer.commons.httpserver.daos.CoreDao;
1212
import info.unterrainer.commons.httpserver.daos.DaoTransaction;

Diff for: src/main/java/info/unterrainer/commons/httpserver/GenericHandlerGroupBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Arrays;
55
import java.util.LinkedHashMap;
66
import java.util.List;
7-
import info.unterrainer.server.overmindserver.baseobjects.LimitedExecutorService;
7+
import java.util.concurrent.ExecutorService;
88

99
import info.unterrainer.commons.httpserver.daos.CoreDao;
1010
import info.unterrainer.commons.httpserver.daos.ParamMap;

Diff for: src/main/java/info/unterrainer/commons/httpserver/HandlerExtensions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5-
import info.unterrainer.server.overmindserver.baseobjects.LimitedExecutorService;
5+
import java.util.concurrent.ExecutorService;
66

77
import info.unterrainer.commons.httpserver.exceptions.GracefulCancelationException;
88
import info.unterrainer.commons.httpserver.extensions.AsyncExtensionContext;

Diff for: src/main/java/info/unterrainer/commons/httpserver/HttpServer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import java.util.HashSet;
77
import java.util.List;
88
import java.util.Optional;
9-
import info.unterrainer.server.overmindserver.baseobjects.LimitedExecutorService;
9+
import java.util.concurrent.ExecutorService;
1010
import java.util.concurrent.LinkedBlockingQueue;
11-
import java.util.concurrent.LimitedExecutorService;
11+
import java.util.concurrent.ThreadPoolExecutor;
1212
import java.util.concurrent.TimeUnit;
1313

1414
import org.eclipse.jetty.server.Server;
@@ -71,17 +71,17 @@ private HttpServer() {
7171

7272
@Builder
7373
private HttpServer(final String configPrefix, final String applicationName, final ObjectMapper objectMapper,
74-
final JsonMapper jsonMapper, final LimitedExecutorService executorService, final String... appVersionFqns) {
74+
final JsonMapper jsonMapper, final ExecutorService executorService, final String... appVersionFqns) {
7575
config = HttpServerConfiguration.read(configPrefix);
7676
this.applicationName = applicationName;
7777
this.executorService = executorService;
7878
this.appVersionFqns = new ArrayList<>(List.of(Optional.ofNullable(appVersionFqns).orElse(new String[0])));
7979
if (!this.appVersionFqns.contains(VERSION_FQN))
8080
this.appVersionFqns.add(VERSION_FQN);
8181
if (executorService == null) {
82-
this.executorService = new LimitedExecutorService(200, 200, 60L, TimeUnit.SECONDS,
82+
this.executorService = new ThreadPoolExecutor(200, 200, 60L, TimeUnit.SECONDS,
8383
new LinkedBlockingQueue<Runnable>());
84-
((LimitedExecutorService) this.executorService).allowCoreThreadTimeOut(true);
84+
((ThreadPoolExecutor) this.executorService).allowCoreThreadTimeOut(true);
8585
}
8686
if (applicationName == null)
8787
throw new IllegalArgumentException("The application-name cannot be null");

0 commit comments

Comments
 (0)