This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git


The following commit(s) were added to refs/heads/master by this push:
     new ef994bf  update null warning annotations
ef994bf is described below

commit ef994bfbc9ae2288c66ef8be7fd3997913cc9144
Author: sseifert <[email protected]>
AuthorDate: Thu Aug 23 23:46:01 2018 +0200

    update null warning annotations
---
 .../sling/testing/mock/sling/MockAdapterManagerImpl.java    |  1 +
 .../java/org/apache/sling/testing/mock/sling/MockSling.java |  1 -
 .../sling/testing/mock/sling/MockSlingScriptHelper.java     |  3 +--
 .../mock/sling/ResourceResolverFactoryInitializer.java      |  3 +--
 .../mock/sling/ThreadsafeMockAdapterManagerWrapper.java     |  1 +
 .../sling/testing/mock/sling/builder/ContentBuilder.java    |  2 --
 .../testing/mock/sling/context/ModelAdapterFactoryUtil.java |  3 +--
 .../sling/testing/mock/sling/context/SlingContextImpl.java  | 13 +------------
 .../sling/testing/mock/sling/loader/ContentLoader.java      |  2 --
 .../mock/sling/services/MockSlingSettingService.java        |  1 -
 .../sling/testing/mock/sling/MockSlingScriptHelperTest.java |  1 -
 .../testing/mock/sling/builder/ContentBuilderTest.java      |  1 -
 .../sling/context/AbstractModelAdapterFactoryUtilTest.java  |  1 +
 .../sling/context/ModelAdapterFactoryUtilClassesTest.java   |  1 -
 .../mock/sling/context/NoResourceResolverTypeTest.java      |  1 -
 .../mock/sling/context/NoSlingModelsRegistrationTest.java   |  1 +
 .../sling/loader/AbstractContentLoaderAutoCommitTest.java   |  1 -
 .../testing/mock/sling/resource/AbstractUniqueRootTest.java |  1 -
 .../mock/sling/services/MockSlingSettingServiceTest.java    |  1 -
 .../sling/testing/mock/sling/junit5/SlingContextStore.java  |  1 +
 .../mock/sling/junit5/NoSlingModelsRegistrationTest.java    |  1 +
 21 files changed, 10 insertions(+), 31 deletions(-)

diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
index 91af2f4..0287b4d 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/MockAdapterManagerImpl.java
@@ -127,6 +127,7 @@ public class MockAdapterManagerImpl implements 
AdapterManager {
      * @see 
org.apache.sling.api.adapter.AdapterManager#getAdapter(java.lang.Object, 
java.lang.Class)
      */
     @Override
+    @SuppressWarnings("null")
     public <AdapterType> AdapterType getAdapter(@NotNull final Object 
adaptable,
             @NotNull final Class<AdapterType> type) {
 
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java 
b/core/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
index f042873..35489ab 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
@@ -81,7 +81,6 @@ public final class MockSling {
         return factory;
     }
 
-    @SuppressWarnings("null")
     private static ResourceResolverTypeAdapter 
getResourceResolverTypeAdapter(final ResourceResolverType type) {
         try {
             Class clazz = 
Class.forName(type.getResourceResolverTypeAdapterClass());
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
index 6a6a7e8..dec6bf4 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelper.java
@@ -61,7 +61,7 @@ public final class MockSlingScriptHelper implements 
SlingScriptHelper {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "null" })
     public <ServiceType> ServiceType getService(@NotNull final 
Class<ServiceType> serviceType) {
         ServiceReference serviceReference = 
this.bundleContext.getServiceReference(serviceType.getName());
         if (serviceReference != null) {
@@ -91,7 +91,6 @@ public final class MockSlingScriptHelper implements 
SlingScriptHelper {
         }
     }
 
-    @SuppressWarnings("null")
     @Override
     public @NotNull SlingScript getScript() {
         return this.script;
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
index 0bdbe9a..2ede7ab 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
@@ -55,7 +55,6 @@ class ResourceResolverFactoryInitializer {
      * @param slingRepository Sling repository. If null resource resolver 
factory is setup without any resource provider.
      * @param bundleContext Bundle context
      */
-    @SuppressWarnings("null")
     public static @NotNull ResourceResolverFactory setUp(@Nullable 
SlingRepository slingRepository, 
             @NotNull BundleContext bundleContext, @NotNull NodeTypeMode 
nodeTypeMode) {
         
@@ -86,7 +85,7 @@ class ResourceResolverFactoryInitializer {
      * Ensure dependencies for JcrResourceProvider are present.
      * @param bundleContext Bundle context
      */
-    @SuppressWarnings({ "unchecked", "null" })
+    @SuppressWarnings("unchecked")
     private static void ensureJcrResourceProviderDependencies(@NotNull 
BundleContext bundleContext) {
         if (bundleContext.getServiceReference(DynamicClassLoaderManager.class) 
== null) {
             bundleContext.registerService(DynamicClassLoaderManager.class, new 
MockDynamicClassLoaderManager(), null);
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
index aa0a572..84018a0 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/ThreadsafeMockAdapterManagerWrapper.java
@@ -42,6 +42,7 @@ class ThreadsafeMockAdapterManagerWrapper implements 
AdapterManager {
     };
 
     @Override
+    @SuppressWarnings("null")
     public <AdapterType> AdapterType getAdapter(@NotNull final Object 
adaptable, @NotNull final Class<AdapterType> type) {
         AdapterManager adapterManager = THREAD_LOCAL.get().getAdapterManager();
         return adapterManager.getAdapter(adaptable, type);
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
index cdfc733..7f8e985 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
@@ -55,7 +55,6 @@ public class ContentBuilder {
      * @param path Page path
      * @return Resource object
      */
-    @SuppressWarnings("null")
     public final @NotNull Resource resource(@NotNull String path) {
         return resource(path, ValueMap.EMPTY);
     }
@@ -88,7 +87,6 @@ public class ContentBuilder {
      * @param properties Properties for resource.
      * @return Resource object
      */
-    @SuppressWarnings("null")
     public final @NotNull Resource resource(@NotNull String path, @NotNull 
Object @NotNull ... properties) {
         return resource(path, MapUtil.toMap(properties));
     }
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
index 7212112..d915136 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
@@ -76,7 +76,6 @@ final class ModelAdapterFactoryUtil {
         // static methods only
     }
 
-    @SuppressWarnings("null")
     private static @NotNull String @NotNull [] toArray(@NotNull 
Collection<String> values) {
         return values.toArray(new String[values.size()]);
     }
@@ -109,7 +108,6 @@ final class ModelAdapterFactoryUtil {
      * @param bundleContext Bundle context
      * @param classNames Java class names
      */
-    @SuppressWarnings("null")
     public static void addModelsForClasses(@NotNull BundleContext 
bundleContext, @NotNull Class @NotNull ... classes) {
         String[] classNames = new String[classes.length];
         for (int i = 0; i < classes.length; i++) {
@@ -360,6 +358,7 @@ final class ModelAdapterFactoryUtil {
         }
 
         @Override
+        @SuppressWarnings("null")
         public <A> A adapt(Class<A> type) {
             return null;
         }
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
index 0a9ae33..3e77450 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
@@ -68,7 +68,6 @@ import com.google.common.collect.ImmutableSet;
 public class SlingContextImpl extends OsgiContextImpl {
 
     // default to publish instance run mode
-    @SuppressWarnings("null")
     static final @NotNull Set<String> DEFAULT_RUN_MODES = 
ImmutableSet.<String> builder().add("publish").build();
 
     private static final @NotNull String RESOURCERESOLVERFACTORYACTIVATOR_PID 
= "org.apache.sling.jcr.resource.internal.JcrResourceResolverFactoryImpl";
@@ -137,7 +136,6 @@ public class SlingContextImpl extends OsgiContextImpl {
         return ContextResourceResolverFactory.get(this.resourceResolverType, 
bundleContext());
     }
     
-    @SuppressWarnings("null")
     private @NotNull ResourceResolverFactory resourceResolverFactory() {
         if (this.resourceResolverFactory == null) {
             this.resourceResolverFactory = newResourceResolverFactory();
@@ -247,7 +245,6 @@ public class SlingContextImpl extends OsgiContextImpl {
     /**
      * @return Resource resolver type
      */
-    @SuppressWarnings("null")
     public final @NotNull ResourceResolverType resourceResolverType() {
         return this.resourceResolverType;
     }
@@ -257,7 +254,7 @@ public class SlingContextImpl extends OsgiContextImpl {
      * It is automatically closed after the test.
      * @return Resource resolver
      */
-    @SuppressWarnings({ "deprecation", "null" })
+    @SuppressWarnings("deprecation")
     public final @NotNull ResourceResolver resourceResolver() {
         if (this.resourceResolver == null) {
             try {
@@ -272,7 +269,6 @@ public class SlingContextImpl extends OsgiContextImpl {
     /**
      * @return Sling request
      */
-    @SuppressWarnings("null")
     public final @NotNull MockSlingHttpServletRequest request() {
         if (this.request == null) {
             this.request = new 
MockSlingHttpServletRequest(this.resourceResolver(), this.bundleContext());
@@ -290,7 +286,6 @@ public class SlingContextImpl extends OsgiContextImpl {
     /**
      * @return Request path info
      */
-    @SuppressWarnings("null")
     public final @NotNull MockRequestPathInfo requestPathInfo() {
         return (MockRequestPathInfo)request().getRequestPathInfo();
     }
@@ -298,7 +293,6 @@ public class SlingContextImpl extends OsgiContextImpl {
     /**
      * @return Sling response
      */
-    @SuppressWarnings("null")
     public final @NotNull MockSlingHttpServletResponse response() {
         if (this.response == null) {
             this.response = new MockSlingHttpServletResponse();
@@ -309,7 +303,6 @@ public class SlingContextImpl extends OsgiContextImpl {
     /**
      * @return Sling script helper
      */
-    @SuppressWarnings("null")
     public final @NotNull SlingScriptHelper slingScriptHelper() {
         if (this.slingScriptHelper == null) {
             this.slingScriptHelper = 
MockSling.newSlingScriptHelper(this.request(), this.response(),
@@ -329,7 +322,6 @@ public class SlingContextImpl extends OsgiContextImpl {
      * @param autoCommit Automatically commit changes after loading content 
(default: true)
      * @return Content loader
      */
-    @SuppressWarnings("null")
     public @NotNull ContentLoader load(boolean autoCommit) {
         if (autoCommit) {
             if (this.contentLoaderAutoCommit == null) {
@@ -351,7 +343,6 @@ public class SlingContextImpl extends OsgiContextImpl {
      * You can use alternatively the {@link #build()} method and use the 
{@link ResourceBuilder} API.
      * @return Content builder for building test content
      */
-    @SuppressWarnings("null")
     public @NotNull ContentBuilder create() {
         if (this.contentBuilder == null) {
             this.contentBuilder = new ContentBuilder(resourceResolver());
@@ -445,7 +436,6 @@ public class SlingContextImpl extends OsgiContextImpl {
      * Set current run mode(s).
      * @param runModes Run mode(s).
      */
-    @SuppressWarnings("null")
     public final void runMode(@NotNull String @NotNull ... runModes) {
         Set<String> newRunModes = ImmutableSet.<String> 
builder().add(runModes).build();
         ServiceReference<SlingSettingsService> ref = 
bundleContext().getServiceReference(SlingSettingsService.class);
@@ -459,7 +449,6 @@ public class SlingContextImpl extends OsgiContextImpl {
      * Create unique root paths for unit tests (and clean them up after the 
test run automatically).
      * @return Unique root path helper
      */
-    @SuppressWarnings("null")
     public @NotNull UniqueRoot uniqueRoot() {
         if (uniqueRoot == null) {
             uniqueRoot = new UniqueRoot(this);
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
index 724f703..36d5fda 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
@@ -352,7 +352,6 @@ public final class ContentLoader {
      * @param mimeType Mime type of binary data
      * @return Resource with binary data
      */
-    @SuppressWarnings("null")
     public @NotNull Resource binaryFile(@NotNull InputStream inputStream, 
@NotNull Resource parentResource, @NotNull String name, @NotNull String 
mimeType) {
         try {
             Resource file = resourceResolver.create(parentResource, name,
@@ -497,7 +496,6 @@ public final class ContentLoader {
      * @param names The names from which to derive the mime type
      * @return Mime type (never null)
      */
-    @SuppressWarnings("null")
     private @NotNull String detectMimeTypeFromNames(@NotNull String @NotNull 
... names) {
         String mimeType = null;
         for (String name : names) {
diff --git 
a/core/src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java
 
b/core/src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java
index 22a2cf8..bca2470 100644
--- 
a/core/src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java
+++ 
b/core/src/main/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingService.java
@@ -38,7 +38,6 @@ public final class MockSlingSettingService implements 
SlingSettingsService {
     /**
      * Instantiate with no default run modes.
      */
-    @SuppressWarnings("null")
     public MockSlingSettingService() {
         this(ImmutableSet.<String> of());
     }
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
index d66f554..462044d 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
@@ -36,7 +36,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
 
-@SuppressWarnings("null")
 public class MockSlingScriptHelperTest {
 
     private ResourceResolver resourceResolver;
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
index d92cdeb..7e8ecb5 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/builder/ContentBuilderTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 
 import com.google.common.collect.ImmutableMap;
 
-@SuppressWarnings("null")
 public class ContentBuilderTest {
 
     @Rule
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java
index eb68682..2b53c75 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractModelAdapterFactoryUtilTest.java
@@ -30,6 +30,7 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext;
 import org.apache.sling.testing.mock.sling.services.MockMimeTypeService;
 import org.junit.Test;
 
+@SuppressWarnings("null")
 public abstract class AbstractModelAdapterFactoryUtilTest {
     
     protected abstract SlingContext context();
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
index f728800..f576075 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
@@ -35,7 +35,6 @@ public class ModelAdapterFactoryUtilClassesTest extends 
AbstractModelAdapterFact
         return context;
     }
 
-    @SuppressWarnings("null")
     @Before
     public void setUp() throws Exception {
         // add Model classes individually
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
index 3e159c1..87c545e 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoResourceResolverTypeTest.java
@@ -32,7 +32,6 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-@SuppressWarnings("null")
 public class NoResourceResolverTypeTest {
 
     @Rule
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java
index a034c51..c7066cb 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/context/NoSlingModelsRegistrationTest.java
@@ -26,6 +26,7 @@ import 
org.apache.sling.testing.mock.sling.junit.SlingContextBuilder;
 import org.junit.Rule;
 import org.junit.Test;
 
+@SuppressWarnings("null")
 public class NoSlingModelsRegistrationTest {
 
     @Rule
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
index cb14cc6..b0df5fd 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderAutoCommitTest.java
@@ -30,7 +30,6 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext;
 import org.junit.Rule;
 import org.junit.Test;
 
-@SuppressWarnings("null")
 public abstract class AbstractContentLoaderAutoCommitTest {
 
     private static String DEST_RES_NAME = "dest";
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
index fe2f8c2..0ddd658 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractUniqueRootTest.java
@@ -26,7 +26,6 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext;
 import org.junit.Rule;
 import org.junit.Test;
 
-@SuppressWarnings("null")
 public abstract class AbstractUniqueRootTest {
     
     @Rule
diff --git 
a/core/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
 
b/core/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
index 1fcdcda..4a96b95 100644
--- 
a/core/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
+++ 
b/core/src/test/java/org/apache/sling/testing/mock/sling/services/MockSlingSettingServiceTest.java
@@ -29,7 +29,6 @@ import org.junit.Test;
 
 import com.google.common.collect.ImmutableSet;
 
-@SuppressWarnings("null")
 public class MockSlingSettingServiceTest {
 
     @Test
diff --git 
a/junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5/SlingContextStore.java
 
b/junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5/SlingContextStore.java
index dc391ab..74ba0d8 100644
--- 
a/junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5/SlingContextStore.java
+++ 
b/junit5/src/main/java/org/apache/sling/testing/mock/sling/junit5/SlingContextStore.java
@@ -39,6 +39,7 @@ final class SlingContextStore {
      * @param testInstance Test instance
      * @return SlingContext or null
      */
+    @SuppressWarnings("null")
     public static SlingContext getSlingContext(ExtensionContext 
extensionContext, Object testInstance) {
         return getStore(extensionContext).get(testInstance, 
SlingContext.class);
     }
diff --git 
a/junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/NoSlingModelsRegistrationTest.java
 
b/junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/NoSlingModelsRegistrationTest.java
index 873c350..975f690 100644
--- 
a/junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/NoSlingModelsRegistrationTest.java
+++ 
b/junit5/src/test/java/org/apache/sling/testing/mock/sling/junit5/NoSlingModelsRegistrationTest.java
@@ -36,6 +36,7 @@ class NoSlingModelsRegistrationTest {
             .build();
 
     @Test
+    @SuppressWarnings("null")
     public void testSlingModelClasspathRegistered() {
         context.request().setAttribute("prop1", "myValue");
         ClasspathRegisteredModel model = 
context.request().adaptTo(ClasspathRegisteredModel.class);

Reply via email to