Merge remote-tracking branch 'upstream/master'

services/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java

@@ -20,6 +20,7 @@ package org.keycloak.services.scheduled;
 import org.keycloak.events.EventStoreProvider;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
+import org.keycloak.timer.ScheduledTask;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

services/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java

@@ -20,6 +20,7 @@ package org.keycloak.services.scheduled;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserSessionProvider;
+import org.keycloak.timer.ScheduledTask;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

services/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java

@@ -23,6 +23,7 @@ import org.keycloak.cluster.ClusterProvider;
 import org.keycloak.cluster.ExecutionResult;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.timer.ScheduledTask;
 
 /**
  * Ensures that there are not concurrent executions of same task (either on this host or any other cluster host)

services/src/main/java/org/keycloak/services/scheduled/ScheduledTask.java

@@ -1,29 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.services.scheduled;
-
-import org.keycloak.models.KeycloakSession;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public interface ScheduledTask {
-
-    public void run(KeycloakSession session);
-
-}

services/src/main/java/org/keycloak/services/scheduled/ScheduledTaskRunner.java

@@ -17,13 +17,10 @@
 
 package org.keycloak.services.scheduled;
 
-import java.util.concurrent.Callable;
-
-import org.keycloak.cluster.ClusterProvider;
-import org.keycloak.cluster.ExecutionResult;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
 import org.keycloak.services.ServicesLogger;
+import org.keycloak.timer.ScheduledTask;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

services/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java

@@ -18,6 +18,9 @@
 package org.keycloak.timer.basic;
 
 import org.jboss.logging.Logger;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.services.scheduled.ScheduledTaskRunner;
+import org.keycloak.timer.ScheduledTask;
 import org.keycloak.timer.TimerProvider;
 
 import java.util.Timer;
@@ -30,16 +33,18 @@ public class BasicTimerProvider implements TimerProvider {
 
     private static final Logger logger = Logger.getLogger(BasicTimerProvider.class);
 
+    private final KeycloakSession session;
     private final Timer timer;
     private final BasicTimerProviderFactory factory;
 
-    public BasicTimerProvider(Timer timer, BasicTimerProviderFactory factory) {
+    public BasicTimerProvider(KeycloakSession session, Timer timer, BasicTimerProviderFactory factory) {
+        this.session = session;
         this.timer = timer;
         this.factory = factory;
     }
 
     @Override
-    public void schedule(final Runnable runnable, final long interval, String taskName) {
+    public void schedule(final Runnable runnable, final long intervalMillis, String taskName) {
         TimerTask task = new TimerTask() {
             @Override
             public void run() {
@@ -53,8 +58,14 @@ public class BasicTimerProvider implements TimerProvider {
             existingTask.cancel();
         }
 
-        logger.debugf("Starting task '%s' with interval '%d'", taskName, interval);
-        timer.schedule(task, interval, interval);
+        logger.debugf("Starting task '%s' with interval '%d'", taskName, intervalMillis);
+        timer.schedule(task, intervalMillis, intervalMillis);
+    }
+
+    @Override
+    public void scheduleTask(ScheduledTask scheduledTask, long intervalMillis, String taskName) {
+        ScheduledTaskRunner scheduledTaskRunner = new ScheduledTaskRunner(session.getKeycloakSessionFactory(), scheduledTask);
+        this.schedule(scheduledTaskRunner, intervalMillis, taskName);
     }
 
     @Override

services/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java

@@ -39,7 +39,7 @@ public class BasicTimerProviderFactory implements TimerProviderFactory {
 
     @Override
     public TimerProvider create(KeycloakSession session) {
-        return new BasicTimerProvider(timer, this);
+        return new BasicTimerProvider(session, timer, this);
     }
 
     @Override