mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-26 20:21:33 +01:00
Removed Jetbrains @NonNull annotations (#2241)
Signed-off-by: Jonathan Gilbert <jpg@trillica.com>
This commit is contained in:
parent
635b700c72
commit
115d39ff35
@ -24,7 +24,6 @@ import java.util.regex.Matcher;
|
|||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import org.eclipse.jdt.annotation.NonNullByDefault;
|
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
import org.openhab.core.service.StartLevelService;
|
import org.openhab.core.service.StartLevelService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -96,7 +95,7 @@ public class ScriptFileReference implements Comparable<ScriptFileReference> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compareTo(@NotNull ScriptFileReference other) {
|
public int compareTo(ScriptFileReference other) {
|
||||||
try {
|
try {
|
||||||
Path path1 = Paths.get(scriptFileURL.toURI());
|
Path path1 = Paths.get(scriptFileURL.toURI());
|
||||||
String name1 = path1.getFileName().toString();
|
String name1 = path1.getFileName().toString();
|
||||||
|
@ -16,8 +16,6 @@ import java.util.Collection;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.*;
|
import java.util.concurrent.*;
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implementation of {@link ScheduledExecutorService} which simply delegates to the instance supplied.
|
* Implementation of {@link ScheduledExecutorService} which simply delegates to the instance supplied.
|
||||||
*
|
*
|
||||||
@ -30,29 +28,23 @@ public class DelegatingScheduledExecutorService implements ScheduledExecutorServ
|
|||||||
this.delegate = delegate;
|
this.delegate = delegate;
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public ScheduledFuture<?> schedule(@NotNull Runnable command, long delay, @NotNull TimeUnit unit) {
|
public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
|
||||||
return delegate.schedule(command, delay, unit);
|
return delegate.schedule(command, delay, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public <V> ScheduledFuture<V> schedule(@NotNull Callable<V> callable, long delay, @NotNull TimeUnit unit) {
|
public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
|
||||||
return delegate.schedule(callable, delay, unit);
|
return delegate.schedule(callable, delay, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public ScheduledFuture<?> scheduleAtFixedRate(@NotNull Runnable command, long initialDelay, long period,
|
public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) {
|
||||||
@NotNull TimeUnit unit) {
|
|
||||||
return delegate.scheduleAtFixedRate(command, initialDelay, period, unit);
|
return delegate.scheduleAtFixedRate(command, initialDelay, period, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public ScheduledFuture<?> scheduleWithFixedDelay(@NotNull Runnable command, long initialDelay, long delay,
|
public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) {
|
||||||
@NotNull TimeUnit unit) {
|
|
||||||
return delegate.scheduleWithFixedDelay(command, initialDelay, delay, unit);
|
return delegate.scheduleWithFixedDelay(command, initialDelay, delay, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,7 +53,6 @@ public class DelegatingScheduledExecutorService implements ScheduledExecutorServ
|
|||||||
delegate.shutdown();
|
delegate.shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public List<Runnable> shutdownNow() {
|
public List<Runnable> shutdownNow() {
|
||||||
return delegate.shutdownNow();
|
return delegate.shutdownNow();
|
||||||
@ -78,56 +69,49 @@ public class DelegatingScheduledExecutorService implements ScheduledExecutorServ
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean awaitTermination(long timeout, @NotNull TimeUnit unit) throws InterruptedException {
|
public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
|
||||||
return delegate.awaitTermination(timeout, unit);
|
return delegate.awaitTermination(timeout, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Future<T> submit(@NotNull Callable<T> task) {
|
public <T> Future<T> submit(Callable<T> task) {
|
||||||
return delegate.submit(task);
|
return delegate.submit(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public <T> Future<T> submit(@NotNull Runnable task, T result) {
|
public <T> Future<T> submit(Runnable task, T result) {
|
||||||
return delegate.submit(task, result);
|
return delegate.submit(task, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public Future<?> submit(@NotNull Runnable task) {
|
public Future<?> submit(Runnable task) {
|
||||||
return delegate.submit(task);
|
return delegate.submit(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> tasks) throws InterruptedException {
|
public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
|
||||||
return delegate.invokeAll(tasks);
|
return delegate.invokeAll(tasks);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> tasks, long timeout,
|
public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
|
||||||
@NotNull TimeUnit unit) throws InterruptedException {
|
throws InterruptedException {
|
||||||
return delegate.invokeAll(tasks, timeout, unit);
|
return delegate.invokeAll(tasks, timeout, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
|
||||||
@Override
|
@Override
|
||||||
public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> tasks)
|
public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
|
||||||
throws InterruptedException, ExecutionException {
|
|
||||||
return delegate.invokeAny(tasks);
|
return delegate.invokeAny(tasks);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> tasks, long timeout, @NotNull TimeUnit unit)
|
public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
|
||||||
throws InterruptedException, ExecutionException, TimeoutException {
|
throws InterruptedException, ExecutionException, TimeoutException {
|
||||||
return delegate.invokeAny(tasks, timeout, unit);
|
return delegate.invokeAny(tasks, timeout, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(@NotNull Runnable command) {
|
public void execute(Runnable command) {
|
||||||
delegate.execute(command);
|
delegate.execute(command);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user