You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/05/29 10:18:46 UTC
syncope git commit: [SYNCOPE-1318] Now using more flexible
ThreadPoolTaskExecutor
Repository: syncope
Updated Branches:
refs/heads/2_0_X 9d30f2349 -> 18407d37a
[SYNCOPE-1318] Now using more flexible ThreadPoolTaskExecutor
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/18407d37
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/18407d37
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/18407d37
Branch: refs/heads/2_0_X
Commit: 18407d37a087dad6ad1befbf5823d94c00b69931
Parents: 9d30f23
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue May 29 12:17:18 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue May 29 12:17:18 2018 +0200
----------------------------------------------------------------------
.../client/console/SyncopeConsoleSession.java | 39 ++++++++------------
.../client/console/commons/Constants.java | 4 ++
.../syncope/client/console/pages/BasePage.java | 8 ++--
.../client/console/wizards/AjaxWizard.java | 8 ++--
4 files changed, 28 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/18407d37/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
index 627f508..de47233 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleSession.java
@@ -27,9 +27,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
import javax.ws.rs.core.EntityTag;
import javax.ws.rs.core.MediaType;
import org.apache.commons.collections4.IterableUtils;
@@ -39,6 +37,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.lib.AnonymousAuthenticationHandler;
import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.client.lib.SyncopeClientFactoryBean;
@@ -53,7 +52,7 @@ import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.concurrent.ThreadPoolExecutorFactoryBean;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
public class SyncopeConsoleSession extends AuthenticatedWebSession {
@@ -61,18 +60,6 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
private static final Logger LOG = LoggerFactory.getLogger(SyncopeConsoleSession.class);
- private static final ThreadPoolExecutorFactoryBean THREAD_POOL_FACTORY;
-
- public static final String AUTHENTICATED = "AUTHENTICATED";
-
- public static final String MENU_COLLAPSE = "MENU_COLLAPSE";
-
- static {
- THREAD_POOL_FACTORY = new ThreadPoolExecutorFactoryBean();
- THREAD_POOL_FACTORY.setThreadNamePrefix(SyncopeConsoleSession.class.getSimpleName());
- THREAD_POOL_FACTORY.setDaemon(true);
- }
-
private final SyncopeClientFactoryBean clientFactory;
private final SyncopeClient anonymousClient;
@@ -81,11 +68,11 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
private final SystemInfo systemInfo;
- private String domain;
-
private final Map<Class<?>, Object> services = Collections.synchronizedMap(new HashMap<Class<?>, Object>());
- private final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(5, THREAD_POOL_FACTORY);
+ private final ThreadPoolTaskExecutor executor;
+
+ private String domain;
private SyncopeClient client;
@@ -110,6 +97,12 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
platformInfo = anonymousClient.getService(SyncopeService.class).platform();
systemInfo = anonymousClient.getService(SyncopeService.class).system();
+
+ executor = new ThreadPoolTaskExecutor();
+ executor.setWaitForTasksToCompleteOnShutdown(false);
+ executor.setCorePoolSize(5);
+ executor.setMaxPoolSize(10);
+ executor.setQueueCapacity(50);
}
public MediaType getMediaType() {
@@ -121,11 +114,11 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
}
public void execute(final Runnable command) {
- executorService.execute(command);
+ executor.execute(command);
}
public <T> Future<T> execute(final Callable<T> command) {
- return executorService.submit(command);
+ return executor.submit(command);
}
public PlatformInfo getPlatformInfo() {
@@ -201,7 +194,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
}
cleanup();
}
- executorService.shutdown();
+ executor.shutdown();
super.invalidate();
}
@@ -213,7 +206,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
}
cleanup();
}
- executorService.shutdownNow();
+ executor.shutdown();
super.invalidateNow();
}
@@ -260,7 +253,7 @@ public class SyncopeConsoleSession extends AuthenticatedWebSession {
public Roles getRoles() {
if (isSignedIn() && roles == null && auth != null) {
roles = new Roles(auth.keySet().toArray(new String[] {}));
- roles.add(AUTHENTICATED);
+ roles.add(Constants.ROLE_AUTHENTICATED);
}
return roles;
http://git-wip-us.apache.org/repos/asf/syncope/blob/18407d37/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index dc2d260..f514789 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -29,6 +29,10 @@ public final class Constants {
public static final String SYNCOPE = "syncope";
+ public static final String ROLE_AUTHENTICATED = "AUTHENTICATED";
+
+ public static final String MENU_COLLAPSE = "MENU_COLLAPSE";
+
public static final String VEIL_INDICATOR_MARKUP_ID = "veil";
public static final String ACTIVITI_MODELER_CONTEXT = "activiti-modeler";
http://git-wip-us.apache.org/repos/asf/syncope/blob/18407d37/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index b2dd098..1fa1ad0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -90,7 +90,7 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
super(parameters);
body = new WebMarkupContainer("body");
- Serializable leftMenuCollapse = SyncopeConsoleSession.get().getAttribute(SyncopeConsoleSession.MENU_COLLAPSE);
+ Serializable leftMenuCollapse = SyncopeConsoleSession.get().getAttribute(Constants.MENU_COLLAPSE);
if ((leftMenuCollapse instanceof Boolean) && ((Boolean) leftMenuCollapse)) {
body.add(new AttributeAppender("class", " sidebar-collapse"));
}
@@ -245,10 +245,10 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
@Override
public void onClick(final AjaxRequestTarget target) {
- SyncopeConsoleSession.get().setAttribute(SyncopeConsoleSession.MENU_COLLAPSE,
- SyncopeConsoleSession.get().getAttribute(SyncopeConsoleSession.MENU_COLLAPSE) == null
+ SyncopeConsoleSession.get().setAttribute(Constants.MENU_COLLAPSE,
+ SyncopeConsoleSession.get().getAttribute(Constants.MENU_COLLAPSE) == null
? true
- : !(Boolean) SyncopeConsoleSession.get().getAttribute(SyncopeConsoleSession.MENU_COLLAPSE));
+ : !(Boolean) SyncopeConsoleSession.get().getAttribute(Constants.MENU_COLLAPSE));
}
});
body.add(new Label("domain", SyncopeConsoleSession.get().getDomain()));
http://git-wip-us.apache.org/repos/asf/syncope/blob/18407d37/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
index a26f6b7..1f14d8f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java
@@ -379,11 +379,11 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard
private Serializable onApply(final AjaxRequestTarget target) throws TimeoutException {
try {
- final Future<Pair<Serializable, Serializable>> executor
- = SyncopeConsoleSession.get().execute(new ApplyFuture(target));
+ Future<Pair<Serializable, Serializable>> executor =
+ SyncopeConsoleSession.get().execute(new ApplyFuture(target));
- final Pair<Serializable, Serializable> res
- = executor.get(SyncopeConsoleApplication.get().getMaxWaitTimeInSeconds(), TimeUnit.SECONDS);
+ Pair<Serializable, Serializable> res =
+ executor.get(SyncopeConsoleApplication.get().getMaxWaitTimeInSeconds(), TimeUnit.SECONDS);
if (res.getLeft() != null) {
send(pageRef.getPage(), Broadcast.BUBBLE, res.getLeft());