[sling-org-apache-sling-resourceresolver] branch master updated: @releng: updated o.a.s.api due to SLING-8116

[radu]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e531d1f  @releng: updated o.a.s.api due to SLING-8116
e531d1f is described below

commit e531d1f1897fe3e8663b0267633bfbc9b2101926
Author: Radu Cotescu <r...@apache.org>
AuthorDate: Thu Nov 14 13:17:02 2019 +0100

    @releng: updated o.a.s.api due to SLING-8116
---
 pom.xml                                                           | 8 +++++++-
 .../apache/sling/resourceresolver/impl/SimpleValueMapImpl.java    | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48538c2..aa238d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.18.4</version>
+            <version>2.21.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -190,5 +190,11 @@
                <version>2.3.10</version>
                <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.converter</artifactId>
+            <version>1.0.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git 
a/src/test/java/org/apache/sling/resourceresolver/impl/SimpleValueMapImpl.java 
b/src/test/java/org/apache/sling/resourceresolver/impl/SimpleValueMapImpl.java
index ef71aa7..9b4f1ac 100644
--- 
a/src/test/java/org/apache/sling/resourceresolver/impl/SimpleValueMapImpl.java
+++ 
b/src/test/java/org/apache/sling/resourceresolver/impl/SimpleValueMapImpl.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.sling.api.resource.ValueMap;
+import org.jetbrains.annotations.NotNull;
 
 public class SimpleValueMapImpl implements ValueMap {
 
@@ -81,7 +82,7 @@ public class SimpleValueMapImpl implements ValueMap {
     }
 
     @SuppressWarnings("unchecked")
-    public <T> T get(String name, Class<T> type) {
+    public <T> T get(@NotNull String name, @NotNull Class<T> type) {
         Object o = delegate.get(name);
         if ( type.equals(String[].class) && ! ( o instanceof String[])) {
             // According to ValueMap if the value cannot be converted it 
should return null
@@ -93,8 +94,9 @@ public class SimpleValueMapImpl implements ValueMap {
         return (T) o;
     }
 
+    @NotNull
     @SuppressWarnings("unchecked")
-    public <T> T get(String name, T defaultValue) {
+    public <T> T get(@NotNull String name, @NotNull T defaultValue) {
         if ( delegate.containsKey(name)) {
             return (T) delegate.get(name);
         }