This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-7803-nullability
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/feature/SLING-7803-nullability
by this push:
new febd77a SLING-7802 update nullability annotations
febd77a is described below
commit febd77abcd4c8258ef4781c67e6cc029e9a523f1
Author: sseifert <[email protected]>
AuthorDate: Mon Aug 6 13:34:50 2018 +0200
SLING-7802 update nullability annotations
---
.../java/org/apache/sling/testing/mock/sling/MockSling.java | 1 +
.../mock/sling/RRMockMockResourceResolverAdapter.java | 3 ++-
.../sling/testing/mock/sling/builder/ContentBuilder.java | 2 +-
.../testing/mock/sling/context/ModelAdapterFactoryUtil.java | 13 +++++++------
.../sling/testing/mock/sling/context/SlingContextImpl.java | 10 +++++-----
.../apache/sling/testing/mock/sling/context/UniqueRoot.java | 3 ++-
.../sling/testing/mock/sling/junit/SlingContextBuilder.java | 10 +++++-----
.../sling/testing/mock/sling/loader/ContentLoader.java | 2 +-
.../sling/context/ModelAdapterFactoryUtilClassesTest.java | 1 +
9 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
b/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
index 35489ab..f042873 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
@@ -81,6 +81,7 @@ 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/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java
b/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java
index 47c4a64..84f9248 100644
---
a/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java
+++
b/src/main/java/org/apache/sling/testing/mock/sling/RRMockMockResourceResolverAdapter.java
@@ -23,13 +23,14 @@ import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.testing.mock.sling.spi.ResourceResolverTypeAdapter;
import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory;
import
org.apache.sling.testing.resourceresolver.MockResourceResolverFactoryOptions;
+import org.jetbrains.annotations.NotNull;
/**
* Resource resolver type adapter for Sling Resource Resolver Mock
implementation.
*/
class RRMockMockResourceResolverAdapter implements ResourceResolverTypeAdapter
{
- private final MockResourceResolverFactoryOptions options;
+ private final @NotNull MockResourceResolverFactoryOptions options;
/**
* Constructor
diff --git
a/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
b/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
index 1ed73f2..cdfc733 100644
---
a/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
+++
b/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
@@ -89,7 +89,7 @@ public class ContentBuilder {
* @return Resource object
*/
@SuppressWarnings("null")
- public final @NotNull Resource resource(@NotNull String path, @NotNull
Object... properties) {
+ public final @NotNull Resource resource(@NotNull String path, @NotNull
Object @NotNull ... properties) {
return resource(path, MapUtil.toMap(properties));
}
diff --git
a/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
b/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
index 7f63026..7212112 100644
---
a/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
+++
b/src/main/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtil.java
@@ -57,8 +57,8 @@ final class ModelAdapterFactoryUtil {
private static final @NotNull String PACKAGE_HEADER =
"Sling-Model-Packages";
private static final @NotNull String CLASSES_HEADER =
"Sling-Model-Classes";
- private static final @NotNull String[] MODELS_PACKAGES_FROM_MANIFEST;
- private static final @NotNull String[] MODELS_CLASSES_FROM_MANIFEST;
+ private static final @NotNull String @NotNull []
MODELS_PACKAGES_FROM_MANIFEST;
+ private static final @NotNull String @NotNull []
MODELS_CLASSES_FROM_MANIFEST;
private static final @NotNull ConcurrentMap<String, List<URL>>
MODEL_URLS_FOR_PACKAGES = new ConcurrentHashMap<String, List<URL>>();
private static final @NotNull ConcurrentMap<String, List<URL>>
MODEL_URLS_FOR_CLASSES = new ConcurrentHashMap<String, List<URL>>();
@@ -77,7 +77,7 @@ final class ModelAdapterFactoryUtil {
}
@SuppressWarnings("null")
- private static @NotNull String[] toArray(@NotNull Collection<String>
values) {
+ private static @NotNull String @NotNull [] toArray(@NotNull
Collection<String> values) {
return values.toArray(new String[values.size()]);
}
@@ -87,7 +87,7 @@ final class ModelAdapterFactoryUtil {
* @param bundleContext Bundle context
* @param packageNames Java package names
*/
- public static void addModelsForPackages(@NotNull BundleContext
bundleContext, @NotNull String... packageNames) {
+ public static void addModelsForPackages(@NotNull BundleContext
bundleContext, @NotNull String @NotNull ... packageNames) {
Bundle bundle = new RegisterModelsBundle(bundleContext, Bundle.ACTIVE,
packageNames, null);
BundleEvent event = new BundleEvent(BundleEvent.STARTED, bundle);
MockOsgi.sendBundleEvent(bundleContext, event);
@@ -98,7 +98,7 @@ final class ModelAdapterFactoryUtil {
* @param bundleContext Bundle context
* @param classNames Java class names
*/
- public static void addModelsForClasses(@NotNull BundleContext
bundleContext, @NotNull String... classNames) {
+ public static void addModelsForClasses(@NotNull BundleContext
bundleContext, @NotNull String @NotNull ... classNames) {
Bundle bundle = new RegisterModelsBundle(bundleContext, Bundle.ACTIVE,
null, classNames);
BundleEvent event = new BundleEvent(BundleEvent.STARTED, bundle);
MockOsgi.sendBundleEvent(bundleContext, event);
@@ -109,7 +109,8 @@ final class ModelAdapterFactoryUtil {
* @param bundleContext Bundle context
* @param classNames Java class names
*/
- public static void addModelsForClasses(@NotNull BundleContext
bundleContext, @NotNull Class... classes) {
+ @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++) {
classNames[i] = classes[i].getName();
diff --git
a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
index 7b97f44..be580ac 100644
---
a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
+++
b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
@@ -185,7 +185,7 @@ public class SlingContextImpl extends OsgiContextImpl {
}
@SuppressWarnings("null")
- private void registerInjectActivateServiceByClassName(@NotNull String...
classNames) {
+ private void registerInjectActivateServiceByClassName(@NotNull String
@NotNull ... classNames) {
for (String className : classNames) {
try {
Class<?> clazz = Class.forName(className);
@@ -422,7 +422,7 @@ public class SlingContextImpl extends OsgiContextImpl {
* register all classes with @Model annotation.
* @param packageNames Java package names
*/
- public final void addModelsForPackage(@NotNull String... packageNames) {
+ public final void addModelsForPackage(@NotNull String @NotNull ...
packageNames) {
ModelAdapterFactoryUtil.addModelsForPackages(bundleContext(),
packageNames);
}
@@ -430,7 +430,7 @@ public class SlingContextImpl extends OsgiContextImpl {
* Search classpath for given class names to scan for and register all
classes with @Model annotation.
* @param classNames Java class names
*/
- public final void addModelsForClasses(@NotNull String... classNames) {
+ public final void addModelsForClasses(@NotNull String @NotNull ...
classNames) {
ModelAdapterFactoryUtil.addModelsForClasses(bundleContext(),
classNames);
}
@@ -438,7 +438,7 @@ public class SlingContextImpl extends OsgiContextImpl {
* Search classpath for given class names to scan for and register all
classes with @Model annotation.
* @param classes Java classes
*/
- public final void addModelsForClasses(@NotNull Class... classes) {
+ public final void addModelsForClasses(@NotNull Class @NotNull ... classes)
{
ModelAdapterFactoryUtil.addModelsForClasses(bundleContext(), classes);
}
@@ -447,7 +447,7 @@ public class SlingContextImpl extends OsgiContextImpl {
* @param runModes Run mode(s).
*/
@SuppressWarnings("null")
- public final void runMode(@NotNull String... runModes) {
+ public final void runMode(@NotNull String @NotNull ... runModes) {
Set<String> newRunModes = ImmutableSet.<String>
builder().add(runModes).build();
ServiceReference<SlingSettingsService> ref =
bundleContext().getServiceReference(SlingSettingsService.class);
if (ref != null) {
diff --git
a/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
b/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
index 4afa6ba..ce73f93 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
@@ -25,6 +25,7 @@ import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +122,7 @@ public class UniqueRoot {
* Deletes the given set of resources and commits afterwards.
* @param resources Resources to be deleted
*/
- protected final void deleteResources(@NotNull Resource... resources) {
+ protected final void deleteResources(@Nullable Resource @NotNull ...
resources) {
for (Resource resource : resources) {
if (resource != null &&
context.resourceResolver.getResource(resource.getPath()) != null) {
try {
diff --git
a/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java
b/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java
index e7fe3f6..afe5cb5 100644
---
a/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java
+++
b/src/main/java/org/apache/sling/testing/mock/sling/junit/SlingContextBuilder.java
@@ -67,7 +67,7 @@ public final class SlingContextBuilder {
* @return this
*/
@SafeVarargs
- public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
plugin(@NotNull ContextPlugin<T>... plugin) {
+ public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
plugin(@NotNull ContextPlugin<T> @NotNull ... plugin) {
plugins.addPlugin(plugin);
return this;
}
@@ -78,7 +78,7 @@ public final class SlingContextBuilder {
* @return this
*/
@SafeVarargs
- public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
beforeSetUp(@NotNull ContextCallback<T>... beforeSetUpCallback) {
+ public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
beforeSetUp(@NotNull ContextCallback<T> @NotNull ... beforeSetUpCallback) {
plugins.addBeforeSetUpCallback(beforeSetUpCallback);
return this;
}
@@ -89,7 +89,7 @@ public final class SlingContextBuilder {
* @return this
*/
@SafeVarargs
- public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
afterSetUp(@NotNull ContextCallback<T>... afterSetUpCallback) {
+ public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
afterSetUp(@NotNull ContextCallback<T> @NotNull ... afterSetUpCallback) {
plugins.addAfterSetUpCallback(afterSetUpCallback);
return this;
}
@@ -100,7 +100,7 @@ public final class SlingContextBuilder {
* @return this
*/
@SafeVarargs
- public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
beforeTearDown(@NotNull ContextCallback<T>... beforeTearDownCallback) {
+ public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
beforeTearDown(@NotNull ContextCallback<T> @NotNull ... beforeTearDownCallback)
{
plugins.addBeforeTearDownCallback(beforeTearDownCallback);
return this;
}
@@ -111,7 +111,7 @@ public final class SlingContextBuilder {
* @return this
*/
@SafeVarargs
- public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
afterTearDown(@NotNull ContextCallback<T>... afterTearDownCallback) {
+ public final @NotNull <T extends OsgiContextImpl> SlingContextBuilder
afterTearDown(@NotNull ContextCallback<T> @NotNull ... afterTearDownCallback) {
plugins.addAfterTearDownCallback(afterTearDownCallback);
return this;
}
diff --git
a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
index ba7f822..0faea45 100644
---
a/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
+++
b/src/main/java/org/apache/sling/testing/mock/sling/loader/ContentLoader.java
@@ -468,7 +468,7 @@ public final class ContentLoader {
* @return Mime type (never null)
*/
@SuppressWarnings("null")
- private @NotNull String detectMimeTypeFromNames(@NotNull String... names) {
+ private @NotNull String detectMimeTypeFromNames(@NotNull String @NotNull
... names) {
String mimeType = null;
for (String name : names) {
String fileExtension = StringUtils.substringAfterLast(name, ".");
diff --git
a/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
b/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
index f576075..f728800 100644
---
a/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
+++
b/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilClassesTest.java
@@ -35,6 +35,7 @@ public class ModelAdapterFactoryUtilClassesTest extends
AbstractModelAdapterFact
return context;
}
+ @SuppressWarnings("null")
@Before
public void setUp() throws Exception {
// add Model classes individually
