Skip to content

Commit 8ab294b

Browse files
committed
Check for nulls
1 parent dc28204 commit 8ab294b

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

spock-core/src/main/java/org/spockframework/runtime/NamespacedExtensionStore.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.junit.platform.engine.support.store.NamespacedHierarchicalStoreException;
55
import org.spockframework.runtime.extension.IStore;
66

7+
import java.util.Objects;
78
import java.util.function.Function;
89
import java.util.function.Supplier;
910

@@ -12,10 +13,10 @@ public class NamespacedExtensionStore implements IStore {
1213
private final Supplier<NamespacedExtensionStore> parentProvider;
1314
private final IStore.Namespace namespace;
1415

15-
public NamespacedExtensionStore(NamespacedHierarchicalStore<Namespace> delegate, Supplier<NamespacedExtensionStore> parentProvider, Namespace namespace) {
16-
this.delegate = delegate;
17-
this.parentProvider = parentProvider;
18-
this.namespace = namespace;
16+
NamespacedExtensionStore(NamespacedHierarchicalStore<Namespace> delegate, Supplier<NamespacedExtensionStore> parentProvider, Namespace namespace) {
17+
this.delegate = Objects.requireNonNull(delegate);
18+
this.parentProvider = Objects.requireNonNull(parentProvider);
19+
this.namespace = Objects.requireNonNull(namespace);
1920
}
2021

2122
@SuppressWarnings("unchecked")

spock-core/src/main/java/org/spockframework/runtime/SpockExecution.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
import org.spockframework.runtime.extension.ISpockExecution;
44
import org.spockframework.runtime.extension.IStore;
55

6+
import java.util.Objects;
7+
68
public class SpockExecution implements ISpockExecution {
79
private final StoreProvider storeProvider;
810

911
public SpockExecution(StoreProvider storeProvider) {
10-
this.storeProvider = storeProvider;
12+
this.storeProvider = Objects.requireNonNull(storeProvider);
1113
}
1214

1315
@Override

spock-core/src/main/java/org/spockframework/runtime/StoreProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
import org.spockframework.runtime.extension.IStore;
55
import org.spockframework.util.Nullable;
66

7+
import java.util.Objects;
8+
79
public class StoreProvider implements AutoCloseable {
810
private static final NamespacedHierarchicalStore.CloseAction<IStore.Namespace> CLOSE_ACTION = (IStore.Namespace namespace, Object key, Object value) -> {
911
if (value instanceof AutoCloseable) {
1012
((AutoCloseable) value).close();
1113
}
1214
};
1315

14-
@Nullable
1516
private final NamespacedHierarchicalStore<IStore.Namespace> backend;
1617
@Nullable
1718
private final StoreProvider parent;
1819

1920
private StoreProvider(NamespacedHierarchicalStore<IStore.Namespace> backend, StoreProvider parent) {
20-
this.backend = backend;
21+
this.backend = Objects.requireNonNull(backend);
2122
this.parent = parent;
2223
}
2324

0 commit comments

Comments
 (0)