Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Generic type parameter for ScheduledFuture in ProtocolExecutorService

Rich Turner93c9593528c9
diff --git a/agent/src/main/java/org/openremote/agent/protocol/ProtocolExecutorService.java b/agent/src/main/java/org/openremote/agent/protocol/ProtocolExecutorService.java
index 6e8cb6984..f6ace5c0c 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/ProtocolExecutorService.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/ProtocolExecutorService.java
@@ -34,15 +34,15 @@ public interface ProtocolExecutorService extends ScheduledExecutorService, Conta
/**
* @see java.util.concurrent.ScheduledExecutorService#schedule
*/
- ScheduledFuture schedule(Runnable runnable, long delayMillis);
+ ScheduledFuture<?> schedule(Runnable runnable, long delayMillis);
/**
* @see java.util.concurrent.ScheduledExecutorService#scheduleAtFixedRate)
*/
- ScheduledFuture scheduleAtFixedRate(Runnable runnable, long initialDelayMillis, long periodMillis);
+ ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelayMillis, long periodMillis);
/**
* @see java.util.concurrent.ScheduledExecutorService#scheduleWithFixedDelay
*/
- ScheduledFuture scheduleWithFixedDelay(Runnable runnable, long initialDelayMillis, long periodMillis);
+ ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long initialDelayMillis, long periodMillis);
}
diff --git a/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java b/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java
index da6fbcace..1e119d6cc 100644
--- a/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java
+++ b/manager/src/main/java/org/openremote/manager/concurrent/ManagerExecutorService.java
@@ -64,17 +64,17 @@ public class ManagerExecutorService implements ProtocolExecutorService {
}
@Override
- public ScheduledFuture schedule(Runnable runnable, long delayMillis) {
+ public ScheduledFuture<?> schedule(Runnable runnable, long delayMillis) {
return scheduledTasksExecutor.schedule(runnable, delayMillis, TimeUnit.MILLISECONDS);
}
@Override
- public ScheduledFuture scheduleAtFixedRate(Runnable runnable, long initialDelayMillis, long periodMillis) {
+ public ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelayMillis, long periodMillis) {
return scheduledTasksExecutor.scheduleAtFixedRate(runnable, initialDelayMillis, periodMillis, TimeUnit.MILLISECONDS);
}
@Override
- public ScheduledFuture scheduleWithFixedDelay(Runnable runnable, long initialDelayMillis, long periodMillis) {
+ public ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long initialDelayMillis, long periodMillis) {
return scheduledTasksExecutor.scheduleWithFixedDelay(runnable, initialDelayMillis, periodMillis, TimeUnit.MILLISECONDS);
}