diff options
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 { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | dependencies { | 14 | dependencies { |
15 | compileOnly libs.jetbrainsAnnotations | ||
16 | testCompileOnly libs.jetbrainsAnnotations | ||
15 | testImplementation libs.hamcrest | 17 | testImplementation libs.hamcrest |
16 | testImplementation libs.junit.api | 18 | testImplementation libs.junit.api |
17 | testRuntimeOnly libs.junit.engine | 19 | 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" | |||
9 | xtext = "2.29.0" | 9 | xtext = "2.29.0" |
10 | 10 | ||
11 | [libraries] | 11 | [libraries] |
12 | jetbrainsAnnotations = { group = "org.jetbrains", name = "annotations", version = "23.1.0"} | ||
12 | eclipseCollections = { group = "org.eclipse.collections", name = "eclipse-collections", version.ref = "eclipseCollections" } | 13 | eclipseCollections = { group = "org.eclipse.collections", name = "eclipse-collections", version.ref = "eclipseCollections" } |
13 | eclipseCollections-api = { group = "org.eclipse.collections", name = "eclipse-collections-api", version.ref = "eclipseCollections" } | 14 | eclipseCollections-api = { group = "org.eclipse.collections", name = "eclipse-collections-api", version.ref = "eclipseCollections" } |
14 | ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version = "2.29.0" } | 15 | 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; | |||
12 | /** | 12 | /** |
13 | * Based on | 13 | * Based on |
14 | * {@link org.eclipse.xtext.web.server.model.IWebDocumentProvider.DefaultImpl}. | 14 | * {@link org.eclipse.xtext.web.server.model.IWebDocumentProvider.DefaultImpl}. |
15 | * | 15 | * |
16 | * @author Kristóf Marussy | 16 | * @author Kristóf Marussy |
17 | */ | 17 | */ |
18 | @Singleton | 18 | @Singleton |
@@ -23,7 +23,7 @@ public class PushWebDocumentProvider implements IWebDocumentProvider { | |||
23 | @Override | 23 | @Override |
24 | public XtextWebDocument get(String resourceId, IServiceContext serviceContext) { | 24 | public XtextWebDocument get(String resourceId, IServiceContext serviceContext) { |
25 | if (resourceId == null) { | 25 | if (resourceId == null) { |
26 | return new XtextWebDocument(resourceId, synchronizerProvider.get()); | 26 | return new XtextWebDocument(null, synchronizerProvider.get()); |
27 | } else { | 27 | } else { |
28 | // We only need to send push messages if a resourceId is specified. | 28 | // We only need to send push messages if a resourceId is specified. |
29 | return new PushWebDocument(resourceId, | 29 | 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 @@ | |||
1 | package tools.refinery.language.web.tests; | 1 | package tools.refinery.language.web.tests; |
2 | 2 | ||
3 | import org.jetbrains.annotations.NotNull; | ||
3 | import org.slf4j.Logger; | 4 | import org.slf4j.Logger; |
4 | import org.slf4j.LoggerFactory; | 5 | import org.slf4j.LoggerFactory; |
5 | 6 | ||
@@ -7,7 +8,6 @@ import java.util.Collection; | |||
7 | import java.util.List; | 8 | import java.util.List; |
8 | import java.util.concurrent.*; | 9 | import java.util.concurrent.*; |
9 | 10 | ||
10 | @SuppressWarnings("NullableProblems") | ||
11 | public class RestartableCachedThreadPool implements ExecutorService { | 11 | public class RestartableCachedThreadPool implements ExecutorService { |
12 | private static final Logger LOG = LoggerFactory.getLogger(RestartableCachedThreadPool.class); | 12 | private static final Logger LOG = LoggerFactory.getLogger(RestartableCachedThreadPool.class); |
13 | 13 | ||
@@ -40,34 +40,36 @@ public class RestartableCachedThreadPool implements ExecutorService { | |||
40 | } | 40 | } |
41 | 41 | ||
42 | @Override | 42 | @Override |
43 | public boolean awaitTermination(long arg0, TimeUnit arg1) throws InterruptedException { | 43 | public boolean awaitTermination(long arg0, @NotNull TimeUnit arg1) throws InterruptedException { |
44 | return delegate.awaitTermination(arg0, arg1); | 44 | return delegate.awaitTermination(arg0, arg1); |
45 | } | 45 | } |
46 | 46 | ||
47 | @Override | 47 | @Override |
48 | public void execute(Runnable arg0) { | 48 | public void execute(@NotNull Runnable arg0) { |
49 | delegate.execute(arg0); | 49 | delegate.execute(arg0); |
50 | } | 50 | } |
51 | 51 | ||
52 | @Override | 52 | @Override |
53 | public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> arg0, long arg1, TimeUnit arg2) | 53 | public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0, long arg1, |
54 | @NotNull TimeUnit arg2) | ||
54 | throws InterruptedException { | 55 | throws InterruptedException { |
55 | return delegate.invokeAll(arg0, arg1, arg2); | 56 | return delegate.invokeAll(arg0, arg1, arg2); |
56 | } | 57 | } |
57 | 58 | ||
58 | @Override | 59 | @Override |
59 | public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> arg0) throws InterruptedException { | 60 | public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException { |
60 | return delegate.invokeAll(arg0); | 61 | return delegate.invokeAll(arg0); |
61 | } | 62 | } |
62 | 63 | ||
63 | @Override | 64 | @Override |
64 | public <T> T invokeAny(Collection<? extends Callable<T>> arg0, long arg1, TimeUnit arg2) | 65 | public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0, long arg1, @NotNull TimeUnit arg2) |
65 | throws InterruptedException, ExecutionException, TimeoutException { | 66 | throws InterruptedException, ExecutionException, TimeoutException { |
66 | return delegate.invokeAny(arg0, arg1, arg2); | 67 | return delegate.invokeAny(arg0, arg1, arg2); |
67 | } | 68 | } |
68 | 69 | ||
69 | @Override | 70 | @Override |
70 | public <T> T invokeAny(Collection<? extends Callable<T>> arg0) throws InterruptedException, ExecutionException { | 71 | public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException, |
72 | ExecutionException { | ||
71 | return delegate.invokeAny(arg0); | 73 | return delegate.invokeAny(arg0); |
72 | } | 74 | } |
73 | 75 | ||
@@ -92,17 +94,17 @@ public class RestartableCachedThreadPool implements ExecutorService { | |||
92 | } | 94 | } |
93 | 95 | ||
94 | @Override | 96 | @Override |
95 | public <T> Future<T> submit(Callable<T> arg0) { | 97 | public <T> Future<T> submit(@NotNull Callable<T> arg0) { |
96 | return delegate.submit(arg0); | 98 | return delegate.submit(arg0); |
97 | } | 99 | } |
98 | 100 | ||
99 | @Override | 101 | @Override |
100 | public <T> Future<T> submit(Runnable arg0, T arg1) { | 102 | public <T> Future<T> submit(@NotNull Runnable arg0, T arg1) { |
101 | return delegate.submit(arg0, arg1); | 103 | return delegate.submit(arg0, arg1); |
102 | } | 104 | } |
103 | 105 | ||
104 | @Override | 106 | @Override |
105 | public Future<?> submit(Runnable arg0) { | 107 | public Future<?> submit(@NotNull Runnable arg0) { |
106 | return delegate.submit(arg0); | 108 | return delegate.submit(arg0); |
107 | } | 109 | } |
108 | } | 110 | } |