4 files changed, 17 insertions, 12 deletions

diff --git a/buildSrc/src/main/groovy/refinery-java-conventions.gradle b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
index eedefdf8..3e59353e 100644
--- a/buildSrc/src/main/groovy/refinery-java-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
@@ -12,6 +12,8 @@ repositories {
 }
 
 dependencies {
+        compileOnly libs.jetbrainsAnnotations
+        testCompileOnly libs.jetbrainsAnnotations
         testImplementation libs.hamcrest
         testImplementation libs.junit.api
         testRuntimeOnly libs.junit.engine
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 05797e73..0ee21b5e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,7 @@ slf4j = "2.0.5"
 xtext = "2.29.0"
 
 [libraries]
+jetbrainsAnnotations = { group = "org.jetbrains", name = "annotations", version = "23.1.0"}
 eclipseCollections = { group = "org.eclipse.collections", name = "eclipse-collections", version.ref = "eclipseCollections" }
 eclipseCollections-api = { group = "org.eclipse.collections", name = "eclipse-collections-api", version.ref = "eclipseCollections" }
 ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version = "2.29.0" }
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentProvider.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentProvider.java
index fc45f74a..b6f04748 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentProvider.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentProvider.java
@@ -12,7 +12,7 @@ import com.google.inject.Singleton;
 /**
  * Based on
  * {@link org.eclipse.xtext.web.server.model.IWebDocumentProvider.DefaultImpl}.
- * 
+ *
  * @author Kristóf Marussy
  */
 @Singleton
@@ -23,7 +23,7 @@ public class PushWebDocumentProvider implements IWebDocumentProvider {
         @Override
         public XtextWebDocument get(String resourceId, IServiceContext serviceContext) {
                 if (resourceId == null) {
-                        return new XtextWebDocument(resourceId, synchronizerProvider.get());
+                        return new XtextWebDocument(null, synchronizerProvider.get());
                 } else {
                         // We only need to send push messages if a resourceId is specified.
                         return new PushWebDocument(resourceId,
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
index 8e5038ae..a8655313 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
@@ -1,5 +1,6 @@
 package tools.refinery.language.web.tests;
 
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -7,7 +8,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.*;
 
-@SuppressWarnings("NullableProblems")
 public class RestartableCachedThreadPool implements ExecutorService {
         private static final Logger LOG = LoggerFactory.getLogger(RestartableCachedThreadPool.class);
 
@@ -40,34 +40,36 @@ public class RestartableCachedThreadPool implements ExecutorService {
         }
 
         @Override
-        public boolean awaitTermination(long arg0, TimeUnit arg1) throws InterruptedException {
+        public boolean awaitTermination(long arg0, @NotNull TimeUnit arg1) throws InterruptedException {
                 return delegate.awaitTermination(arg0, arg1);
         }
 
         @Override
-        public void execute(Runnable arg0) {
+        public void execute(@NotNull Runnable arg0) {
                 delegate.execute(arg0);
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> arg0, long arg1, TimeUnit arg2)
+        public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0, long arg1,
+                                                                                 @NotNull TimeUnit arg2)
                         throws InterruptedException {
                 return delegate.invokeAll(arg0, arg1, arg2);
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> arg0) throws InterruptedException {
+        public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException {
                 return delegate.invokeAll(arg0);
         }
 
         @Override
-        public <T> T invokeAny(Collection<? extends Callable<T>> arg0, long arg1, TimeUnit arg2)
+        public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0, long arg1, @NotNull TimeUnit arg2)
                         throws InterruptedException, ExecutionException, TimeoutException {
                 return delegate.invokeAny(arg0, arg1, arg2);
         }
 
         @Override
-        public <T> T invokeAny(Collection<? extends Callable<T>> arg0) throws InterruptedException, ExecutionException {
+        public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException,
+                        ExecutionException {
                 return delegate.invokeAny(arg0);
         }
 
@@ -92,17 +94,17 @@ public class RestartableCachedThreadPool implements ExecutorService {
         }
 
         @Override
-        public <T> Future<T> submit(Callable<T> arg0) {
+        public <T> Future<T> submit(@NotNull Callable<T> arg0) {
                 return delegate.submit(arg0);
         }
 
         @Override
-        public <T> Future<T> submit(Runnable arg0, T arg1) {
+        public <T> Future<T> submit(@NotNull Runnable arg0, T arg1) {
                 return delegate.submit(arg0, arg1);
         }
 
         @Override
-        public Future<?> submit(Runnable arg0) {
+        public Future<?> submit(@NotNull Runnable arg0) {
                 return delegate.submit(arg0);
         }
 }